230929 2021-09-28 18:35:22 -0700 Nullptr deref when accessing m_value.calc in CSSPrimitiveValue::primitiveType() 2021-10-05 11:28:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 gnavamarino webkit-unassigned darin esprehn+autocc ews-watchlist glenn graouts gyuyoung.kim macpherson menard nmouchtaris simon.fraser webkit-bug-importer oldest_to_newest 1798133 0 gnavamarino 2021-09-28 18:35:22 -0700 We should check for m_value.calc existence before dereferencing, as is currently done in other places in CSSPrimitiveValue class. 1798399 1 439616 gnavamarino 2021-09-29 09:43:49 -0700 Created attachment 439616 Patch 1798602 2 439616 darin 2021-09-29 15:16:56 -0700 Comment on attachment 439616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439616&action=review > Source/WebCore/ChangeLog:4 > + Nullptr deref when accessing m_value.calc in CSSPrimitiveValue::primitiveType() > + https://bugs.webkit.org/show_bug.cgi?id=230929 Overall this doesn’t look right. Type set to CSS_CALC, but calc pointer set to nullptr is an invalid state, and changing all the functions to support that isn’t the correct solution. Instead I suggest we focus on how we end up in this state and preventing us from doing so. > Source/WebCore/css/CSSPrimitiveValue.cpp:436 > - m_value.calc = c.leakRef(); > + if (c) > + m_value.calc = c.leakRef(); This specific change is either is a no-op or seems pretty dangerous. It will leave m_value.calc uninitialized if this is called with nullptr. That’s not *better* than setting it to nullptr. 1798692 3 gnavamarino 2021-09-29 17:16:54 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 439616 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=439616&action=review > > > Source/WebCore/ChangeLog:4 > > + Nullptr deref when accessing m_value.calc in CSSPrimitiveValue::primitiveType() > > + https://bugs.webkit.org/show_bug.cgi?id=230929 > > Overall this doesn’t look right. Type set to CSS_CALC, but calc pointer set > to nullptr is an invalid state, and changing all the functions to support > that isn’t the correct solution. Thank you for pointing this out. After taking a closer look, I believe we can prevent this state (see below) by how we handle blending from LengthType::FitContent. > > Instead I suggest we focus on how we end up in this state and preventing us > from doing so. We end up in this bad state as a result of trying to blend from a FitContent LengthType to a Calculated LengthType as a result of the div animation. The attempt to create a CSSCalcExpressionNode for LengthType::FitContent is not supported as evidenced by the switch statement falling through to a ASSERT_NOT_REACHED(). I will see if we can prevent this blending action much higher upstream before reaching this code. > > > Source/WebCore/css/CSSPrimitiveValue.cpp:436 > > - m_value.calc = c.leakRef(); > > + if (c) > > + m_value.calc = c.leakRef(); > > This specific change is either is a no-op or seems pretty dangerous. It will > leave m_value.calc uninitialized if this is called with nullptr. That’s not > *better* than setting it to nullptr. 1798719 4 439616 darin 2021-09-29 18:26:46 -0700 Comment on attachment 439616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439616&action=review >>> Source/WebCore/css/CSSPrimitiveValue.cpp:436 >>> + m_value.calc = c.leakRef(); >> >> This specific change is either is a no-op or seems pretty dangerous. It will leave m_value.calc uninitialized if this is called with nullptr. That’s not *better* than setting it to nullptr. > > Thinking further about this, even if we fix the true cause of the null CSSCalcValue, I suggest we also change this init function to either take Ref<CSSCalcValue> instead of RefPtr<CSSCalcValue>, like all the other init functions, or change it so that if it’s passed nullptr it returns early and does nothing, leaving the primitive unit type set to the default CSS_UNKNOWN. 1799642 5 439936 gnavamarino 2021-10-01 17:04:45 -0700 Created attachment 439936 Patch 1799643 6 gnavamarino 2021-10-01 17:05:07 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 439616 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=439616&action=review > > >>> Source/WebCore/css/CSSPrimitiveValue.cpp:436 > >>> + m_value.calc = c.leakRef(); > >> > >> This specific change is either is a no-op or seems pretty dangerous. It will leave m_value.calc uninitialized if this is called with nullptr. That’s not *better* than setting it to nullptr. > > > > > > Thinking further about this, even if we fix the true cause of the null > CSSCalcValue, I suggest we also change this init function to either take > Ref<CSSCalcValue> instead of RefPtr<CSSCalcValue>, like all the other init > functions, or change it so that if it’s passed nullptr it returns early and > does nothing, leaving the primitive unit type set to the default CSS_UNKNOWN. Thank you for the suggestions! I will proceed with the second recommended approach to fix this particular bug, by returning early if we have a nullptr. However, I have filed https://bugs.webkit.org/show_bug.cgi?id=231111 to track the first approach. I have also verified the updated patch resolves the crash referenced in this bug. 1799649 7 439936 darin 2021-10-01 17:17:09 -0700 Comment on attachment 439936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439936&action=review > Source/WebCore/css/CSSPrimitiveValue.cpp:435 > + // TODO(webrtc:231111): this init should take Ref<CSSCalcValue> instead This comment is not yet the right format for WebKit coding style: 1) We use FIXME, not TODO. 2) Not sure what "webrtc:" is about, OK to put a bug number in though. 3) We use sentence style, with a capital letter at the start, and a period at the end. 1800207 8 440100 gnavamarino 2021-10-04 13:37:29 -0700 Created attachment 440100 Patch 1800208 9 gnavamarino 2021-10-04 13:39:53 -0700 (In reply to Darin Adler from comment #7) > Comment on attachment 439936 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=439936&action=review > > > Source/WebCore/css/CSSPrimitiveValue.cpp:435 > > + // TODO(webrtc:231111): this init should take Ref<CSSCalcValue> instead > > This comment is not yet the right format for WebKit coding style: > > 1) We use FIXME, not TODO. > 2) Not sure what "webrtc:" is about, OK to put a bug number in though. > 3) We use sentence style, with a capital letter at the start, and a period > at the end. Thank you, I have updated the format per the recommended style. 1800663 10 ews-feeder 2021-10-05 11:27:00 -0700 Committed r283562 (242527@main): <https://commits.webkit.org/242527@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440100. 1800665 11 webkit-bug-importer 2021-10-05 11:28:17 -0700 <rdar://problem/83895771> 439616 2021-09-29 09:43:49 -0700 2021-10-01 17:04:41 -0700 Patch bug-230929-20210929094348.patch text/plain 3790 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjI4ZjVhYWY5ZWY0MDRh OGI3ZWYzMmQ3MWI2MDVmNDRhZmZlOGU2Yi4uOWNlNzU0MDQ2N2U3NmI4MTdmYzhiZjZmYjkzNzc2 YWQ1NDdiY2I2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA5LTI5ICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIE51bGxw dHIgZGVyZWYgd2hlbiBhY2Nlc3NpbmcgbV92YWx1ZS5jYWxjIGluIENTU1ByaW1pdGl2ZVZhbHVl OjpwcmltaXRpdmVUeXBlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzMDkyOQorCisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpwcmltaXRpdmVUeXBlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjppbml0KToKKyAgICAgICAg KFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoRG91YmxlIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpkb3VibGVWYWx1ZSBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Y29sbGVjdERpcmVjdENvbXB1 dGF0aW9uYWxEZXBlbmRlbmNpZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0 aXZlVmFsdWU6OmNvbGxlY3REaXJlY3RSb290Q29tcHV0YXRpb25hbERlcGVuZGVuY2llcyBjb25z dCk6CisKIDIwMjEtMDktMjkgIE9saXZpZXIgQmxpbiAgPG9saXZpZXIuYmxpbkBzb2Z0YXRob21l LmNvbT4KIAogICAgICAgICBGaXggdHlwbyBpbiBSZW5kZXJTVkdCbG9jazo6dXBkYXRlRnJvbVN0 eWxlIGNvbW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVW YWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuY3BwCmluZGV4 IDFlZjdkZDE0NDk0MzhiMGFiMjBiZWY3ZWQ1NjY0OTgwMTQ0NWU5MzAuLmY2OGZiMjk2OWQxZmEw MDhmZWQyOThhNmRjN2RiZWNkYmM0MTZlMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1p dGl2ZVZhbHVlLmNwcApAQCAtMjAzLDcgKzIwMyw3IEBAIENTU1VuaXRUeXBlIENTU1ByaW1pdGl2 ZVZhbHVlOjpwcmltaXRpdmVUeXBlKCkgY29uc3QKICAgICBpZiAocHJpbWl0aXZlVW5pdFR5cGUo KSA9PSBDU1NVbml0VHlwZTo6Q1NTX0ZPTlRfRkFNSUxZKQogICAgICAgICByZXR1cm4gQ1NTVW5p dFR5cGU6OkNTU19TVFJJTkc7CiAKLSAgICBpZiAocHJpbWl0aXZlVW5pdFR5cGUoKSAhPSBDU1NV bml0VHlwZTo6Q1NTX0NBTEMpCisgICAgaWYgKChwcmltaXRpdmVVbml0VHlwZSgpICE9IENTU1Vu aXRUeXBlOjpDU1NfQ0FMQykgfHwgIW1fdmFsdWUuY2FsYykKICAgICAgICAgcmV0dXJuIHByaW1p dGl2ZVVuaXRUeXBlKCk7CiAKICAgICBzd2l0Y2ggKG1fdmFsdWUuY2FsYy0+Y2F0ZWdvcnkoKSkg ewpAQCAtNDMyLDcgKzQzMiw4IEBAIHZvaWQgQ1NTUHJpbWl0aXZlVmFsdWU6OmluaXQoUmVmUHRy PENTU0NhbGNWYWx1ZT4mJiBjKQogewogICAgIHNldFByaW1pdGl2ZVVuaXRUeXBlKENTU1VuaXRU eXBlOjpDU1NfQ0FMQyk7CiAgICAgbV9oYXNDYWNoZWRDU1NUZXh0ID0gZmFsc2U7Ci0gICAgbV92 YWx1ZS5jYWxjID0gYy5sZWFrUmVmKCk7CisgICAgaWYgKGMpCisgICAgICAgIG1fdmFsdWUuY2Fs YyA9IGMubGVha1JlZigpOwogfQogCiBDU1NQcmltaXRpdmVWYWx1ZTo6fkNTU1ByaW1pdGl2ZVZh bHVlKCkKQEAgLTU4MSw3ICs1ODIsNyBAQCB0ZW1wbGF0ZTw+IExheW91dFVuaXQgQ1NTUHJpbWl0 aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGgoY29uc3QgQ1NTVG9MZW5ndGhDb252ZXJzaQogCiBkb3Vi bGUgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbXB1dGVMZW5ndGhEb3VibGUoY29uc3QgQ1NTVG9MZW5n dGhDb252ZXJzaW9uRGF0YSYgY29udmVyc2lvbkRhdGEpIGNvbnN0CiB7Ci0gICAgaWYgKHByaW1p dGl2ZVVuaXRUeXBlKCkgPT0gQ1NTVW5pdFR5cGU6OkNTU19DQUxDKSB7CisgICAgaWYgKChwcmlt aXRpdmVVbml0VHlwZSgpID09IENTU1VuaXRUeXBlOjpDU1NfQ0FMQykgJiYgbV92YWx1ZS5jYWxj KSB7CiAgICAgICAgIC8vIFRoZSBtdWx0aXBsaWVyIGFuZCBmYWN0b3IgaXMgYXBwbGllZCB0byBl YWNoIHZhbHVlIGluIHRoZSBjYWxjIGV4cHJlc3Npb24gaW5kaXZpZHVhbGx5CiAgICAgICAgIHJl dHVybiBtX3ZhbHVlLmNhbGMtPmNvbXB1dGVMZW5ndGhQeChjb252ZXJzaW9uRGF0YSk7CiAgICAg fQpAQCAtODMzLDcgKzgzNCw3IEBAIGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6ZG91YmxlVmFs dWUoQ1NTVW5pdFR5cGUgdW5pdFR5cGUpIGNvbnN0CiAKIGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1 ZTo6ZG91YmxlVmFsdWUoKSBjb25zdAogewotICAgIHJldHVybiBwcmltaXRpdmVVbml0VHlwZSgp ICE9IENTU1VuaXRUeXBlOjpDU1NfQ0FMQyA/IG1fdmFsdWUubnVtIDogbV92YWx1ZS5jYWxjLT5k b3VibGVWYWx1ZSgpOworICAgIHJldHVybiBwcmltaXRpdmVVbml0VHlwZSgpICE9IENTU1VuaXRU eXBlOjpDU1NfQ0FMQyA/IG1fdmFsdWUubnVtIDogKG1fdmFsdWUuY2FsYyA/IG1fdmFsdWUuY2Fs Yy0+ZG91YmxlVmFsdWUoKSA6IDAuMCk7CiB9CiAKIGRvdWJsZSBDU1NQcmltaXRpdmVWYWx1ZTo6 ZG91YmxlVmFsdWVEaXZpZGluZ0J5MTAwSWZQZXJjZW50YWdlKCkgY29uc3QKQEAgLTEyNTksNyAr MTI2MCw4IEBAIHZvaWQgQ1NTUHJpbWl0aXZlVmFsdWU6OmNvbGxlY3REaXJlY3RDb21wdXRhdGlv bmFsRGVwZW5kZW5jaWVzKEhhc2hTZXQ8Q1NTUHJvcGVyCiAgICAgICAgIHZhbHVlcy5hZGQoQ1NT UHJvcGVydHlMaW5lSGVpZ2h0KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDU1NVbml0VHlw ZTo6Q1NTX0NBTEM6Ci0gICAgICAgIG1fdmFsdWUuY2FsYy0+Y29sbGVjdERpcmVjdENvbXB1dGF0 aW9uYWxEZXBlbmRlbmNpZXModmFsdWVzKTsKKyAgICAgICAgaWYgKG1fdmFsdWUuY2FsYykKKyAg ICAgICAgICAgIG1fdmFsdWUuY2FsYy0+Y29sbGVjdERpcmVjdENvbXB1dGF0aW9uYWxEZXBlbmRl bmNpZXModmFsdWVzKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJl YWs7CkBAIC0xMjc3LDcgKzEyNzksOCBAQCB2b2lkIENTU1ByaW1pdGl2ZVZhbHVlOjpjb2xsZWN0 RGlyZWN0Um9vdENvbXB1dGF0aW9uYWxEZXBlbmRlbmNpZXMoSGFzaFNldDxDU1NQcgogICAgICAg ICB2YWx1ZXMuYWRkKENTU1Byb3BlcnR5TGluZUhlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgQ1NTVW5pdFR5cGU6OkNTU19DQUxDOgotICAgICAgICBtX3ZhbHVlLmNhbGMtPmNvbGxl Y3REaXJlY3RSb290Q29tcHV0YXRpb25hbERlcGVuZGVuY2llcyh2YWx1ZXMpOworICAgICAgICBp ZiAobV92YWx1ZS5jYWxjKQorICAgICAgICAgICAgbV92YWx1ZS5jYWxjLT5jb2xsZWN0RGlyZWN0 Um9vdENvbXB1dGF0aW9uYWxEZXBlbmRlbmNpZXModmFsdWVzKTsKICAgICAgICAgYnJlYWs7CiAg ICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7Cg== 439936 2021-10-01 17:04:45 -0700 2021-10-04 13:37:25 -0700 Patch bug-230929-20211001170444.patch text/plain 4517 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDkwOTA5NjFmZjAxZDI2 NjZlZWJiNDlhMmYzZWRiM2MwYWU4NzM2OC4uYmQ3ZDdkYmI0YzZlNmNjMDI2ZmZkNzFkM2M1YmQ5 YzMyNTUyYTRlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEwLTAxICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFVuc3Vw cG9ydGVkIGJsZW5kaW5nIG9mIG1peGVkIGxlbmd0aCB0eXBlcyBsZWFkcyB0byBudWxscHRyIGRl cmVmIHdoZW4gYWNjZXNzaW5nIG1fdmFsdWUuY2FsYyBpbiBDU1NQcmltaXRpdmVWYWx1ZTo6cHJp bWl0aXZlVHlwZSgpCisgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMwOTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdDogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9maXQtY29udGVudC1taW4t aGVpZ2h0LWFuaW1hdGlvbi5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmluaXQpOgorICAgICAg ICAqIHBsYXRmb3JtL0xlbmd0aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpibGVuZE1peGVkVHlw ZXMpOgorCiAyMDIxLTEwLTAxICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAK ICAgICAgICAgRGlzYWJsZSBuZXcgaW5jdW1iZW50LXdpbmRvdyB1bnRpbCBpdCBpcyBmdWxseSBp bXBsZW1lbnRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZh bHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHAKaW5kZXgg YTNlZGY0N2I1MTg0MzgwZmVjMDU2ZWZkMjJiOWY4ZDQzNGVkMTZiZS4uNmYzYTkxNGNiODg3MzNk NmQ0MDFjMGM4MDNmNWQyYzhiMThkMDQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0 aXZlVmFsdWUuY3BwCkBAIC00MzIsNiArNDMyLDkgQEAgdm9pZCBDU1NQcmltaXRpdmVWYWx1ZTo6 aW5pdChSZWY8Q1NTQmFzaWNTaGFwZT4mJiBzaGFwZSkKIAogdm9pZCBDU1NQcmltaXRpdmVWYWx1 ZTo6aW5pdChSZWZQdHI8Q1NTQ2FsY1ZhbHVlPiYmIGMpCiB7CisgICAgLy8gVE9ETyh3ZWJydGM6 MjMxMTExKTogdGhpcyBpbml0IHNob3VsZCB0YWtlIFJlZjxDU1NDYWxjVmFsdWU+IGluc3RlYWQK KyAgICBpZiAoIWMpCisgICAgICAgIHJldHVybjsKICAgICBzZXRQcmltaXRpdmVVbml0VHlwZShD U1NVbml0VHlwZTo6Q1NTX0NBTEMpOwogICAgIG1faGFzQ2FjaGVkQ1NTVGV4dCA9IGZhbHNlOwog ICAgIG1fdmFsdWUuY2FsYyA9IGMubGVha1JlZigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTGVuZ3RoLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xlbmd0aC5j cHAKaW5kZXggMDI0YzIwOTkxY2ZiMWJhNGMyMjBhYjhkODEzOWQ5YTMwNzY1ZjYzZi4uZmRlMjFh MzNiYjk5OGFlMzYwMGNhNTExMzdlYmM0OTFjNDZiMDZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9M ZW5ndGguY3BwCkBAIC0zMDQsNiArMzA0LDkgQEAgc3RhdGljIExlbmd0aCBibGVuZE1peGVkVHlw ZXMoY29uc3QgTGVuZ3RoJiBmcm9tLCBjb25zdCBMZW5ndGgmIHRvLCBjb25zdCBCbGVuZGkKICAg ICBpZiAoIWZyb20uaXNDYWxjdWxhdGVkKCkgJiYgIXRvLmlzUGVyY2VudCgpICYmICghY29udGV4 dC5wcm9ncmVzcyB8fCB0by5pc1plcm8oKSkpCiAgICAgICAgIHJldHVybiBibGVuZChmcm9tLCBM ZW5ndGgoMCwgZnJvbS50eXBlKCkpLCBjb250ZXh0KTsKIAorICAgIGlmIChmcm9tLmlzSW50cmlu c2ljT3JBdXRvKCkgfHwgdG8uaXNJbnRyaW5zaWNPckF1dG8oKSB8fCBmcm9tLmlzUmVsYXRpdmUo KSB8fCB0by5pc1JlbGF0aXZlKCkpCisgICAgICAgIHJldHVybiB7IDAsIExlbmd0aFR5cGU6OkZp eGVkIH07CisKICAgICBhdXRvIGJsZW5kID0gbWFrZVVuaXF1ZTxDYWxjRXhwcmVzc2lvbkJsZW5k TGVuZ3RoPihmcm9tLCB0bywgY29udGV4dC5wcm9ncmVzcyk7CiAgICAgcmV0dXJuIExlbmd0aChD YWxjdWxhdGlvblZhbHVlOjpjcmVhdGUoV1RGTW92ZShibGVuZCksIFZhbHVlUmFuZ2U6OkFsbCkp OwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDEzMTI4ZDg0OGE4MTUzM2U5ZGQ4NWE2NDA2OWViNWZiODI4OTEzOTIuLjc2 MDlmNGNkY2E2M2EzNDJhYmVhOTM4MWFmZDNlN2U4ODM2M2IxOTMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAyMS0xMC0wMSAgR2FicmllbCBOYXZhIE1hcmlubyAgPGduYXZhbWFyaW5vQGFwcGxl LmNvbT4KKworICAgICAgICBVbnN1cHBvcnRlZCBibGVuZGluZyBvZiBtaXhlZCBsZW5ndGggdHlw ZXMgbGVhZHMgdG8gbnVsbHB0ciBkZXJlZiB3aGVuIGFjY2Vzc2luZyBtX3ZhbHVlLmNhbGMgaW4g Q1NTUHJpbWl0aXZlVmFsdWU6OnByaW1pdGl2ZVR5cGUoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwOTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L2ZpdC1jb250ZW50LW1pbi1oZWlnaHQtYW5pbWF0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9maXQtY29udGVudC1taW4taGVp Z2h0LWFuaW1hdGlvbi5odG1sOiBBZGRlZC4KKwogMjAyMS0xMC0wMSAgQXl1bWkgS29qaW1hICA8 YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBbIG1hY09TIHdrMiBSZWxlYXNlIF0g aHR0cC90ZXN0cy9sb2FkaW5nL3ByZWxvYWQtc2xvdy1sb2FkaW5nLnB5IGlzIGEgZmxha3kgZmFp bHVyZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvZml0LWNvbnRlbnQtbWluLWhlaWdodC1hbmltYXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9maXQtY29udGVudC1taW4taGVpZ2h0 LWFuaW1hdGlvbi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2VmMjJlOWE0MzFhZDAyNzI3MTNi NzFmZGM4Nzk0MDE2YzhlZjEyZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv bGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0LWNvbnRlbnQtbWluLWhlaWdodC1hbmltYXRpb24t ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0LWNvbnRlbnQtbWluLWhlaWdodC1hbmlt YXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0 LWNvbnRlbnQtbWluLWhlaWdodC1hbmltYXRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iYWY0ZDE0ZWM5 Y2U2YzBkNGU4YTdjZmExMDRiODYyYWZhZWVjMDE2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9maXQtY29udGVudC1taW4taGVpZ2h0 LWFuaW1hdGlvbi5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzxzdHlsZT4KKyAgQGtleWZyYW1lcyBh MCB7CisgICAgZnJvbSB7CisgICAgICBtaW4taGVpZ2h0OiBmaXQtY29udGVudDsKKyAgICB9Cisg IH0KKyAgZGl2IHsKKyAgICBhbmltYXRpb24tZmlsbC1tb2RlOiBmb3J3YXJkczsKKyAgICBhbmlt YXRpb24tbmFtZTogYTA7CisgICAgZGlzcGxheTogdGFibGU7CisgICAgbWluLWhlaWdodDogY2Fs YygxcHggKyAxJSk7CisgIH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICBvbmxvYWQgPSAoKSA9PiB7 CisgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ1NlbGVjdEFsbCcpOworICAgIGRvY3VtZW50LmV4 ZWNDb21tYW5kKCdDb3B5Jyk7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICAg IHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgIH0KKyAgfTsKKzwvc2NyaXB0PgorPGRpdj4K K1BBU1MKKzwvZGl2Pgo= 440100 2021-10-04 13:37:29 -0700 2021-10-05 11:27:03 -0700 Patch bug-230929-20211004133728.patch text/plain 4518 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDkwOTA5NjFmZjAxZDI2 NjZlZWJiNDlhMmYzZWRiM2MwYWU4NzM2OC4uY2I3MGNiZDRjMDRmYWI3NWZjNDk2ZTJkMTI1NjAx Y2MwOWI2ZDUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEwLTAxICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFVuc3Vw cG9ydGVkIGJsZW5kaW5nIG9mIG1peGVkIGxlbmd0aCB0eXBlcyBsZWFkcyB0byBudWxscHRyIGRl cmVmIHdoZW4gYWNjZXNzaW5nIG1fdmFsdWUuY2FsYyBpbiBDU1NQcmltaXRpdmVWYWx1ZTo6cHJp bWl0aXZlVHlwZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzA5MjkKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAg ICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2ZpdC1jb250ZW50LW1pbi1oZWln aHQtYW5pbWF0aW9uLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6aW5pdCk6CisgICAgICAgICog cGxhdGZvcm0vTGVuZ3RoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJsZW5kTWl4ZWRUeXBlcyk6 CisKIDIwMjEtMTAtMDEgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAg ICAgICBEaXNhYmxlIG5ldyBpbmN1bWJlbnQtd2luZG93IHVudGlsIGl0IGlzIGZ1bGx5IGltcGxl bWVudGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmNwcAppbmRleCBhM2Vk ZjQ3YjUxODQzODBmZWMwNTZlZmQyMmI5ZjhkNDM0ZWQxNmJlLi43MDU4NDBkNzZiOTFmODgyN2Iw ZWI2N2ZiMGMwODQyMmM0OTliMTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJpbWl0aXZlVmFsdWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVW YWx1ZS5jcHAKQEAgLTQzMiw2ICs0MzIsOSBAQCB2b2lkIENTU1ByaW1pdGl2ZVZhbHVlOjppbml0 KFJlZjxDU1NCYXNpY1NoYXBlPiYmIHNoYXBlKQogCiB2b2lkIENTU1ByaW1pdGl2ZVZhbHVlOjpp bml0KFJlZlB0cjxDU1NDYWxjVmFsdWU+JiYgYykKIHsKKyAgICAvLyBGSVhNRSAoMjMxMTExKTog VGhpcyBpbml0IHNob3VsZCB0YWtlIFJlZjxDU1NDYWxjVmFsdWU+IGluc3RlYWQuCisgICAgaWYg KCFjKQorICAgICAgICByZXR1cm47CiAgICAgc2V0UHJpbWl0aXZlVW5pdFR5cGUoQ1NTVW5pdFR5 cGU6OkNTU19DQUxDKTsKICAgICBtX2hhc0NhY2hlZENTU1RleHQgPSBmYWxzZTsKICAgICBtX3Zh bHVlLmNhbGMgPSBjLmxlYWtSZWYoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0xlbmd0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9MZW5ndGguY3BwCmluZGV4 IDAyNGMyMDk5MWNmYjFiYTRjMjIwYWI4ZDgxMzlkOWEzMDc2NWY2M2YuLmZkZTIxYTMzYmI5OThh ZTM2MDBjYTUxMTM3ZWJjNDkxYzQ2YjA2ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0xlbmd0aC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGVuZ3RoLmNw cApAQCAtMzA0LDYgKzMwNCw5IEBAIHN0YXRpYyBMZW5ndGggYmxlbmRNaXhlZFR5cGVzKGNvbnN0 IExlbmd0aCYgZnJvbSwgY29uc3QgTGVuZ3RoJiB0bywgY29uc3QgQmxlbmRpCiAgICAgaWYgKCFm cm9tLmlzQ2FsY3VsYXRlZCgpICYmICF0by5pc1BlcmNlbnQoKSAmJiAoIWNvbnRleHQucHJvZ3Jl c3MgfHwgdG8uaXNaZXJvKCkpKQogICAgICAgICByZXR1cm4gYmxlbmQoZnJvbSwgTGVuZ3RoKDAs IGZyb20udHlwZSgpKSwgY29udGV4dCk7CiAKKyAgICBpZiAoZnJvbS5pc0ludHJpbnNpY09yQXV0 bygpIHx8IHRvLmlzSW50cmluc2ljT3JBdXRvKCkgfHwgZnJvbS5pc1JlbGF0aXZlKCkgfHwgdG8u aXNSZWxhdGl2ZSgpKQorICAgICAgICByZXR1cm4geyAwLCBMZW5ndGhUeXBlOjpGaXhlZCB9Owor CiAgICAgYXV0byBibGVuZCA9IG1ha2VVbmlxdWU8Q2FsY0V4cHJlc3Npb25CbGVuZExlbmd0aD4o ZnJvbSwgdG8sIGNvbnRleHQucHJvZ3Jlc3MpOwogICAgIHJldHVybiBMZW5ndGgoQ2FsY3VsYXRp b25WYWx1ZTo6Y3JlYXRlKFdURk1vdmUoYmxlbmQpLCBWYWx1ZVJhbmdlOjpBbGwpKTsKIH0KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAxMzEyOGQ4NDhhODE1MzNlOWRkODVhNjQwNjllYjVmYjgyODkxMzkyLi45NmYyYzhiYTZk MmNlNGMwMGVkYzc3ZjFlOTg0M2ExMDEwZjg3MzEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMTAtMDEgIEdhYnJpZWwgTmF2YSBNYXJpbm8gIDxnbmF2YW1hcmlub0BhcHBsZS5jb20+CisK KyAgICAgICAgVW5zdXBwb3J0ZWQgYmxlbmRpbmcgb2YgbWl4ZWQgbGVuZ3RoIHR5cGVzIGxlYWRz IHRvIG51bGxwdHIgZGVyZWYgd2hlbiBhY2Nlc3NpbmcgbV92YWx1ZS5jYWxjIGluIENTU1ByaW1p dGl2ZVZhbHVlOjpwcmltaXRpdmVUeXBlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDkyOQorCisgICAgICAgIFJldmlld2VkIGJ5IFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC9maXQtY29udGVudC1taW4taGVpZ2h0LWFuaW1hdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0LWNvbnRlbnQtbWluLWhl aWdodC1hbmltYXRpb24uaHRtbDogQWRkZWQuCisKIDIwMjEtMTAtMDEgIEF5dW1pIEtvamltYSAg PGF5dW1pX2tvamltYUBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyB3azIgUmVsZWFzZSBd IGh0dHAvdGVzdHMvbG9hZGluZy9wcmVsb2FkLXNsb3ctbG9hZGluZy5weSBpcyBhIGZsYWt5IGZh aWx1cmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250 ZXh0L2ZpdC1jb250ZW50LW1pbi1oZWlnaHQtYW5pbWF0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0LWNvbnRlbnQtbWluLWhlaWdo dC1hbmltYXRpb24tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdlZjIyZTlhNDMxYWQwMjcyNzEz YjcxZmRjODc5NDAxNmM4ZWYxMmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2ZpdC1jb250ZW50LW1pbi1oZWlnaHQtYW5pbWF0aW9u LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2ZpdC1jb250ZW50LW1pbi1oZWlnaHQtYW5p bWF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2Zp dC1jb250ZW50LW1pbi1oZWlnaHQtYW5pbWF0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmFmNGQxNGVj OWNlNmMwZDRlOGE3Y2ZhMTA0Yjg2MmFmYWVlYzAxNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZml0LWNvbnRlbnQtbWluLWhlaWdo dC1hbmltYXRpb24uaHRtbApAQCAtMCwwICsxLDI1IEBACis8c3R5bGU+CisgIEBrZXlmcmFtZXMg YTAgeworICAgIGZyb20geworICAgICAgbWluLWhlaWdodDogZml0LWNvbnRlbnQ7CisgICAgfQor ICB9CisgIGRpdiB7CisgICAgYW5pbWF0aW9uLWZpbGwtbW9kZTogZm9yd2FyZHM7CisgICAgYW5p bWF0aW9uLW5hbWU6IGEwOworICAgIGRpc3BsYXk6IHRhYmxlOworICAgIG1pbi1oZWlnaHQ6IGNh bGMoMXB4ICsgMSUpOworICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KKyAgb25sb2FkID0gKCkgPT4g eworICAgIGRvY3VtZW50LmV4ZWNDb21tYW5kKCdTZWxlY3RBbGwnKTsKKyAgICBkb2N1bWVudC5l eGVjQ29tbWFuZCgnQ29weScpOworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAg ICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICB9CisgIH07Cis8L3NjcmlwdD4KKzxkaXY+ CitQQVNTCis8L2Rpdj4K