232512 2021-10-29 15:19:33 -0700 Avoid corrupting the hashmap and subsequent nullptr deref by checking that the LayoutUnit is not a deleted value. 2022-11-10 07:52:29 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED InRadar P2 Normal --- 1 johncunningham webkit-unassigned cmarcelo ews-watchlist fred.wang jamesr luiz simon.fraser tonikitoo webkit-bug-importer wenson_hsieh youennf oldest_to_newest 1810287 0 johncunningham 2021-10-29 15:19:33 -0700 Fix a null ptr deref by checking that newOffset is a valid key before adding to the HashMap. 1810288 1 442872 johncunningham 2021-10-29 15:20:05 -0700 Created attachment 442872 Patch 1810290 2 442873 johncunningham 2021-10-29 15:25:09 -0700 Created attachment 442873 Patch 1810847 3 442873 ap 2021-11-01 13:47:55 -0700 Comment on attachment 442873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442873&action=review > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). Can a test be added for this? 1811266 4 443134 johncunningham 2021-11-02 14:23:30 -0700 Created attachment 443134 Patch 1811267 5 johncunningham 2021-11-02 14:27:49 -0700 <rdar://84450793> 1811277 6 443134 wenson_hsieh 2021-11-02 14:47:29 -0700 Comment on attachment 443134 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443134&action=review It looks like the newly added test is failing on test runners. > Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.cpp:291 > + if (offsets.isValidKey(newOffset)) { Nit - we generally prefer early returns over multiline if statements like this. 1811723 7 443260 johncunningham 2021-11-03 17:29:57 -0700 Created attachment 443260 Patch 1812259 8 webkit-bug-importer 2021-11-05 15:20:19 -0700 <rdar://problem/85087814> 1911530 9 youennf 2022-11-10 07:52:01 -0800 This patch is no longer necessary, closing bug. 442872 2021-10-29 15:20:05 -0700 2021-10-29 15:25:05 -0700 Patch bug-232512-20211029152005.patch text/plain 2799 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JkNzE2ZGU5NTZmYmY2 N2M0NWVjOGY0NjIyM2I3ZDVlZGNhNTlkZi4uNjhkMjhiMWQ0YjAyNDVlOGUwOGRlYTJkY2YwNTA3 NmQ0N2I0MDgzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI5ICBKb2hu IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGEg bnVsbCBwdHIgZGVyZWYgYnkgY2hlY2tpbmcgdGhhdCBuZXdPZmZzZXQgaXMgYSB2YWxpZCBrZXkg YmVmb3JlIGFkZGluZyB0byB0aGUgSGFzaE1hcC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjUxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICog cGFnZS9zY3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNldHNJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnVwZGF0ZVNuYXBPZmZzZXRzRm9yU2Nyb2xsYWJsZUFyZWEpOgorCiAyMDIxLTEwLTI4ICBO aWtvbGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtE ZWJ1Z10gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50 L3BhdGgtb2JqZWN0cy8yZC5wYXRoLmVsbGlwc2UuYmFzaWNzLmh0bWwgaXMgYXNzZXJ0aW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxTbmFwT2Zmc2V0 c0luZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNl dHNJbmZvLmNwcAppbmRleCA2OGM1NzYzMDk4YTg2OTc2YjFkY2E1OGUzMzdjMGFkNzY1MTc3ODMz Li44YmU1Mzk3N2M1YjdjMTBhOGQ3YzA3YzkwMjkxNWE5NTUzMjY5ZWE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxTbmFwT2Zmc2V0c0luZm8uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbFNuYXBPZmZzZXRzSW5mby5j cHAKQEAgLTI4OCwxNiArMjg4LDE4IEBAIHZvaWQgdXBkYXRlU25hcE9mZnNldHNGb3JTY3JvbGxh YmxlQXJlYShTY3JvbGxhYmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEsIGNvbnN0IFJlCiAKICAgICBh dXRvIGFkZE9yVXBkYXRlU3RvcEZvclNuYXBPZmZzZXQgPSBbXShIYXNoTWFwPExheW91dFVuaXQs IFNuYXBPZmZzZXQ8TGF5b3V0VW5pdD4+JiBvZmZzZXRzLCBMYXlvdXRVbml0IG5ld09mZnNldCwg U2Nyb2xsU25hcFN0b3Agc3RvcCwgYm9vbCBoYXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCwg c2l6ZV90IHNuYXBBcmVhSW5kaWNlcykKICAgICB7Ci0gICAgICAgIGF1dG8gb2Zmc2V0ID0gb2Zm c2V0cy5lbnN1cmUobmV3T2Zmc2V0LCBbJl0gewotICAgICAgICAgICAgcmV0dXJuIFNuYXBPZmZz ZXQ8TGF5b3V0VW5pdD4geyBuZXdPZmZzZXQsIHN0b3AsIGhhc1NuYXBBcmVhTGFyZ2VyVGhhblZp ZXdwb3J0LCB7IH0gfTsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChvZmZzZXRzLmlzVmFsaWRL ZXkobmV3T2Zmc2V0KSkgeworICAgICAgICAgICAgYXV0byBvZmZzZXQgPSBvZmZzZXRzLmVuc3Vy ZShuZXdPZmZzZXQsIFsmXSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNuYXBPZmZzZXQ8TGF5 b3V0VW5pdD4geyBuZXdPZmZzZXQsIHN0b3AsIGhhc1NuYXBBcmVhTGFyZ2VyVGhhblZpZXdwb3J0 LCB7IH0gfTsKKyAgICAgICAgICAgIH0pOwogCi0gICAgICAgIC8vIElmIHRoZSBvZmZzZXQgYWxy ZWFkeSBleGlzdHMsIHdlIGVuc3VyZSB0aGF0IGl0IGhhcyBTY3JvbGxTbmFwU3RvcDo6QWx3YXlz LCB3aGVuIGFwcHJvcHJpYXRlLgotICAgICAgICBpZiAoc3RvcCA9PSBTY3JvbGxTbmFwU3RvcDo6 QWx3YXlzKQotICAgICAgICAgICAgb2Zmc2V0Lml0ZXJhdG9yLT52YWx1ZS5zdG9wID0gU2Nyb2xs U25hcFN0b3A6OkFsd2F5czsKKyAgICAgICAgICAgIC8vIElmIHRoZSBvZmZzZXQgYWxyZWFkeSBl eGlzdHMsIHdlIGVuc3VyZSB0aGF0IGl0IGhhcyBTY3JvbGxTbmFwU3RvcDo6QWx3YXlzLCB3aGVu IGFwcHJvcHJpYXRlLgorICAgICAgICAgICAgaWYgKHN0b3AgPT0gU2Nyb2xsU25hcFN0b3A6OkFs d2F5cykKKyAgICAgICAgICAgICAgICBvZmZzZXQuaXRlcmF0b3ItPnZhbHVlLnN0b3AgPSBTY3Jv bGxTbmFwU3RvcDo6QWx3YXlzOwogCi0gICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuaGFz U25hcEFyZWFMYXJnZXJUaGFuVmlld3BvcnQgfD0gaGFzU25hcEFyZWFMYXJnZXJUaGFuVmlld3Bv cnQ7Ci0gICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuc25hcEFyZWFJbmRpY2VzLmFwcGVu ZChzbmFwQXJlYUluZGljZXMpOworICAgICAgICAgICAgb2Zmc2V0Lml0ZXJhdG9yLT52YWx1ZS5o YXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCB8PSBoYXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3 cG9ydDsKKyAgICAgICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuc25hcEFyZWFJbmRpY2Vz LmFwcGVuZChzbmFwQXJlYUluZGljZXMpOworICAgICAgICB9CiAgICAgfTsKIAogICAgIEhhc2hN YXA8TGF5b3V0VW5pdCwgU25hcE9mZnNldDxMYXlvdXRVbml0Pj4gdmVydGljYWxTbmFwT2Zmc2V0 c01hcDsK 442873 2021-10-29 15:25:09 -0700 2021-11-02 14:23:27 -0700 Patch bug-232512-20211029152508.patch text/plain 2799 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JkNzE2ZGU5NTZmYmY2 N2M0NWVjOGY0NjIyM2I3ZDVlZGNhNTlkZi4uNjhkMjhiMWQ0YjAyNDVlOGUwOGRlYTJkY2YwNTA3 NmQ0N2I0MDgzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI5ICBKb2hu IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGEg bnVsbCBwdHIgZGVyZWYgYnkgY2hlY2tpbmcgdGhhdCBuZXdPZmZzZXQgaXMgYSB2YWxpZCBrZXkg YmVmb3JlIGFkZGluZyB0byB0aGUgSGFzaE1hcC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjUxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICog cGFnZS9zY3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNldHNJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnVwZGF0ZVNuYXBPZmZzZXRzRm9yU2Nyb2xsYWJsZUFyZWEpOgorCiAyMDIxLTEwLTI4ICBO aWtvbGFvcyBNb3VjaHRhcmlzICA8bm1vdWNodGFyaXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtE ZWJ1Z10gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50 L3BhdGgtb2JqZWN0cy8yZC5wYXRoLmVsbGlwc2UuYmFzaWNzLmh0bWwgaXMgYXNzZXJ0aW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxTbmFwT2Zmc2V0 c0luZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNl dHNJbmZvLmNwcAppbmRleCA2OGM1NzYzMDk4YTg2OTc2YjFkY2E1OGUzMzdjMGFkNzY1MTc3ODMz Li44YmU1Mzk3N2M1YjdjMTBhOGQ3YzA3YzkwMjkxNWE5NTUzMjY5ZWE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxTbmFwT2Zmc2V0c0luZm8uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbFNuYXBPZmZzZXRzSW5mby5j cHAKQEAgLTI4OCwxNiArMjg4LDE4IEBAIHZvaWQgdXBkYXRlU25hcE9mZnNldHNGb3JTY3JvbGxh YmxlQXJlYShTY3JvbGxhYmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEsIGNvbnN0IFJlCiAKICAgICBh dXRvIGFkZE9yVXBkYXRlU3RvcEZvclNuYXBPZmZzZXQgPSBbXShIYXNoTWFwPExheW91dFVuaXQs IFNuYXBPZmZzZXQ8TGF5b3V0VW5pdD4+JiBvZmZzZXRzLCBMYXlvdXRVbml0IG5ld09mZnNldCwg U2Nyb2xsU25hcFN0b3Agc3RvcCwgYm9vbCBoYXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCwg c2l6ZV90IHNuYXBBcmVhSW5kaWNlcykKICAgICB7Ci0gICAgICAgIGF1dG8gb2Zmc2V0ID0gb2Zm c2V0cy5lbnN1cmUobmV3T2Zmc2V0LCBbJl0gewotICAgICAgICAgICAgcmV0dXJuIFNuYXBPZmZz ZXQ8TGF5b3V0VW5pdD4geyBuZXdPZmZzZXQsIHN0b3AsIGhhc1NuYXBBcmVhTGFyZ2VyVGhhblZp ZXdwb3J0LCB7IH0gfTsKLSAgICAgICAgfSk7CisgICAgICAgIGlmIChvZmZzZXRzLmlzVmFsaWRL ZXkobmV3T2Zmc2V0KSkgeworICAgICAgICAgICAgYXV0byBvZmZzZXQgPSBvZmZzZXRzLmVuc3Vy ZShuZXdPZmZzZXQsIFsmXSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNuYXBPZmZzZXQ8TGF5 b3V0VW5pdD4geyBuZXdPZmZzZXQsIHN0b3AsIGhhc1NuYXBBcmVhTGFyZ2VyVGhhblZpZXdwb3J0 LCB7IH0gfTsKKyAgICAgICAgICAgIH0pOwogCi0gICAgICAgIC8vIElmIHRoZSBvZmZzZXQgYWxy ZWFkeSBleGlzdHMsIHdlIGVuc3VyZSB0aGF0IGl0IGhhcyBTY3JvbGxTbmFwU3RvcDo6QWx3YXlz LCB3aGVuIGFwcHJvcHJpYXRlLgotICAgICAgICBpZiAoc3RvcCA9PSBTY3JvbGxTbmFwU3RvcDo6 QWx3YXlzKQotICAgICAgICAgICAgb2Zmc2V0Lml0ZXJhdG9yLT52YWx1ZS5zdG9wID0gU2Nyb2xs U25hcFN0b3A6OkFsd2F5czsKKyAgICAgICAgICAgIC8vIElmIHRoZSBvZmZzZXQgYWxyZWFkeSBl eGlzdHMsIHdlIGVuc3VyZSB0aGF0IGl0IGhhcyBTY3JvbGxTbmFwU3RvcDo6QWx3YXlzLCB3aGVu IGFwcHJvcHJpYXRlLgorICAgICAgICAgICAgaWYgKHN0b3AgPT0gU2Nyb2xsU25hcFN0b3A6OkFs d2F5cykKKyAgICAgICAgICAgICAgICBvZmZzZXQuaXRlcmF0b3ItPnZhbHVlLnN0b3AgPSBTY3Jv bGxTbmFwU3RvcDo6QWx3YXlzOwogCi0gICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuaGFz U25hcEFyZWFMYXJnZXJUaGFuVmlld3BvcnQgfD0gaGFzU25hcEFyZWFMYXJnZXJUaGFuVmlld3Bv cnQ7Ci0gICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuc25hcEFyZWFJbmRpY2VzLmFwcGVu ZChzbmFwQXJlYUluZGljZXMpOworICAgICAgICAgICAgb2Zmc2V0Lml0ZXJhdG9yLT52YWx1ZS5o YXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCB8PSBoYXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3 cG9ydDsKKyAgICAgICAgICAgIG9mZnNldC5pdGVyYXRvci0+dmFsdWUuc25hcEFyZWFJbmRpY2Vz LmFwcGVuZChzbmFwQXJlYUluZGljZXMpOworICAgICAgICB9CiAgICAgfTsKIAogICAgIEhhc2hN YXA8TGF5b3V0VW5pdCwgU25hcE9mZnNldDxMYXlvdXRVbml0Pj4gdmVydGljYWxTbmFwT2Zmc2V0 c01hcDsK 443134 2021-11-02 14:23:30 -0700 2021-11-03 17:29:53 -0700 Patch bug-232512-20211102142330.patch text/plain 4204 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0OTZjYWYyOGI4YzRm YmEyNGUyMmIyNTRiYWY5NmRlYzFlNzM5Mi4uZDBjYWU2NTQ2YWU4MjI3MDg5YzM2MzAwYjI2ZTU4 NWNiOThlNTNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTExLTAyICBKb2hu IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGEg bnVsbCBwdHIgZGVyZWYgYnkgY2hlY2tpbmcgdGhhdCBuZXdPZmZzZXQgaXMgYSB2YWxpZCBrZXkg YmVmb3JlIGFkZGluZyB0byB0aGUgSGFzaE1hcC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjUxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNldHNJ bmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVNuYXBPZmZzZXRzRm9yU2Nyb2xsYWJs ZUFyZWEpOgorCiAyMDIxLTExLTAyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gUHJvdmlkZSBiaWRpIHByb3BlcnRpZXMgd2hl biBjb25zdHJ1Y3RpbmcgVGV4dFJ1bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsU25hcE9mZnNldHNJbmZvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbFNuYXBPZmZzZXRzSW5mby5jcHAKaW5kZXggNjhjNTc2MzA5OGE4Njk3 NmIxZGNhNThlMzM3YzBhZDc2NTE3NzgzMy4uOGJlNTM5NzdjNWI3YzEwYThkN2MwN2M5MDI5MTVh OTU1MzI2OWVhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsU25hcE9mZnNldHNJbmZvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxTbmFwT2Zmc2V0c0luZm8uY3BwCkBAIC0yODgsMTYgKzI4OCwxOCBAQCB2b2lkIHVw ZGF0ZVNuYXBPZmZzZXRzRm9yU2Nyb2xsYWJsZUFyZWEoU2Nyb2xsYWJsZUFyZWEmIHNjcm9sbGFi bGVBcmVhLCBjb25zdCBSZQogCiAgICAgYXV0byBhZGRPclVwZGF0ZVN0b3BGb3JTbmFwT2Zmc2V0 ID0gW10oSGFzaE1hcDxMYXlvdXRVbml0LCBTbmFwT2Zmc2V0PExheW91dFVuaXQ+PiYgb2Zmc2V0 cywgTGF5b3V0VW5pdCBuZXdPZmZzZXQsIFNjcm9sbFNuYXBTdG9wIHN0b3AsIGJvb2wgaGFzU25h cEFyZWFMYXJnZXJUaGFuVmlld3BvcnQsIHNpemVfdCBzbmFwQXJlYUluZGljZXMpCiAgICAgewot ICAgICAgICBhdXRvIG9mZnNldCA9IG9mZnNldHMuZW5zdXJlKG5ld09mZnNldCwgWyZdIHsKLSAg ICAgICAgICAgIHJldHVybiBTbmFwT2Zmc2V0PExheW91dFVuaXQ+IHsgbmV3T2Zmc2V0LCBzdG9w LCBoYXNTbmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCwgeyB9IH07Ci0gICAgICAgIH0pOworICAg ICAgICBpZiAob2Zmc2V0cy5pc1ZhbGlkS2V5KG5ld09mZnNldCkpIHsKKyAgICAgICAgICAgIGF1 dG8gb2Zmc2V0ID0gb2Zmc2V0cy5lbnN1cmUobmV3T2Zmc2V0LCBbJl0geworICAgICAgICAgICAg ICAgIHJldHVybiBTbmFwT2Zmc2V0PExheW91dFVuaXQ+IHsgbmV3T2Zmc2V0LCBzdG9wLCBoYXNT bmFwQXJlYUxhcmdlclRoYW5WaWV3cG9ydCwgeyB9IH07CisgICAgICAgICAgICB9KTsKIAotICAg ICAgICAvLyBJZiB0aGUgb2Zmc2V0IGFscmVhZHkgZXhpc3RzLCB3ZSBlbnN1cmUgdGhhdCBpdCBo YXMgU2Nyb2xsU25hcFN0b3A6OkFsd2F5cywgd2hlbiBhcHByb3ByaWF0ZS4KLSAgICAgICAgaWYg KHN0b3AgPT0gU2Nyb2xsU25hcFN0b3A6OkFsd2F5cykKLSAgICAgICAgICAgIG9mZnNldC5pdGVy YXRvci0+dmFsdWUuc3RvcCA9IFNjcm9sbFNuYXBTdG9wOjpBbHdheXM7CisgICAgICAgICAgICAv LyBJZiB0aGUgb2Zmc2V0IGFscmVhZHkgZXhpc3RzLCB3ZSBlbnN1cmUgdGhhdCBpdCBoYXMgU2Ny b2xsU25hcFN0b3A6OkFsd2F5cywgd2hlbiBhcHByb3ByaWF0ZS4KKyAgICAgICAgICAgIGlmIChz dG9wID09IFNjcm9sbFNuYXBTdG9wOjpBbHdheXMpCisgICAgICAgICAgICAgICAgb2Zmc2V0Lml0 ZXJhdG9yLT52YWx1ZS5zdG9wID0gU2Nyb2xsU25hcFN0b3A6OkFsd2F5czsKIAotICAgICAgICBv ZmZzZXQuaXRlcmF0b3ItPnZhbHVlLmhhc1NuYXBBcmVhTGFyZ2VyVGhhblZpZXdwb3J0IHw9IGhh c1NuYXBBcmVhTGFyZ2VyVGhhblZpZXdwb3J0OwotICAgICAgICBvZmZzZXQuaXRlcmF0b3ItPnZh bHVlLnNuYXBBcmVhSW5kaWNlcy5hcHBlbmQoc25hcEFyZWFJbmRpY2VzKTsKKyAgICAgICAgICAg IG9mZnNldC5pdGVyYXRvci0+dmFsdWUuaGFzU25hcEFyZWFMYXJnZXJUaGFuVmlld3BvcnQgfD0g aGFzU25hcEFyZWFMYXJnZXJUaGFuVmlld3BvcnQ7CisgICAgICAgICAgICBvZmZzZXQuaXRlcmF0 b3ItPnZhbHVlLnNuYXBBcmVhSW5kaWNlcy5hcHBlbmQoc25hcEFyZWFJbmRpY2VzKTsKKyAgICAg ICAgfQogICAgIH07CiAKICAgICBIYXNoTWFwPExheW91dFVuaXQsIFNuYXBPZmZzZXQ8TGF5b3V0 VW5pdD4+IHZlcnRpY2FsU25hcE9mZnNldHNNYXA7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9j c3MzL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdlLW9mZnNldC1jcmFzaC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9jc3MzL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdlLW9mZnNl dC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDhlZWY5M2M0NjJhNGEwYzNlMTQ2ZDBi NjA0NTc0NTBlNDAwYzU3OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvc2Ny b2xsLXNuYXAvc2Nyb2xsLXNuYXAtbGFyZ2Utb2Zmc2V0LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDUgQEAKK1BBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2guKQorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbGFyZ2Utb2Zmc2V0LWNy YXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdl LW9mZnNldC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmEzYjg4OWI1MTNmOWI0Y2YyZmI4N2E4MGFl ZjBjZDMyNDcxOWYxOWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL3Njcm9s bC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdlLW9mZnNldC1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMzMg QEAKKzxodG1sPgorPGhlYWQ+CisgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVz dC1wcmUuanMiPjwvc2NyaXB0PgorICA8c3R5bGU+CisgICAgaHRtbCB7CisgICAgICB3cml0aW5n LW1vZGU6IHRiLXJsOworICAgIH0KKyAgICA6Zmlyc3Qtb2YtdHlwZSB7CisgICAgICBkaXNwbGF5 OiAtd2Via2l0LWlubGluZS1ib3g7CisgICAgfQorICAgIGhlYWQgeworICAgICAgc2NhbGU6IDEw OworICAgIH0KKyAgICBib2R5IHsKKyAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBjZW50ZXI7Cisg ICAgICBzY3JvbGwtc25hcC10eXBlOiB4OworICAgIH0KKyAgICBib2R5Ojotd2Via2l0LXNjcm9s bGJhciB7CisgICAgICBpbmxpbmUtc2l6ZTogMjUwMHB4OworICAgIH0KKyAgICBkaXYgeworICAg ICAgd2lkdGg6IDIxNDc0ODM2NDdweDsKKyAgICB9CisgIDwvc3R5bGU+Cis8Ym9keT4KKyAgPGRp dj48L2Rpdj4KKyAgPGNhbnZhcyBpZD0idGVzdCIgd2lkdGg9IjEwMCIgaGVpZ2h0PSIxMDAiPjwv Y2FudmFzPgorICAgIFBBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2guKQorICA8cHJl IGlkPSdjb25zb2xlJz48L3ByZT4KKyAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10 ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorCis8L2hlYWQ+Cg== 443260 2021-11-03 17:29:57 -0700 2022-11-10 07:52:29 -0800 Patch bug-232512-20211103172956.patch text/plain 3727 johncunningham U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJiNWU4NzM5ZTRhNGMz NGJiZTk3MzkyNDhlZmVhNWU1Njk4N2ZhYy4uNmI0M2ZmNGEyZWYzMDNhYzJhNjlmYzY3ZDBmMWU0 YTdhYmE1Zjk1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAzICBKb2hu IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQg Y29ycnVwdGluZyB0aGUgaGFzaG1hcCBhbmQgc3Vic2VxdWVudCBudWxscHRyIGRlcmVmIGJ5IGNo ZWNraW5nCisgICAgICAgIHRoYXQgdGhlIExheW91dFVuaXQgaXMgbm90IGEgZGVsZXRlZCB2YWx1 ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjUx MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6 IGNzczMvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtbGFyZ2Utb2Zmc2V0LWNyYXNoLmh0bWwKKwor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbFNuYXBPZmZzZXRzSW5mby5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp1cGRhdGVTbmFwT2Zmc2V0c0ZvclNjcm9sbGFibGVBcmVhKToKKwogMjAy MS0xMS0wMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW01v ZGVybiBNZWRpYSBDb250cm9sc10gc2hvdWxkIHNob3cgdHJhY2tzIGJ1dHRvbi9tZW51IGZvciA8 YXVkaW8+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxT bmFwT2Zmc2V0c0luZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs U25hcE9mZnNldHNJbmZvLmNwcAppbmRleCA2OGM1NzYzMDk4YTg2OTc2YjFkY2E1OGUzMzdjMGFk NzY1MTc3ODMzLi4yMjhkZDU1NjdjZTNmYzczYjQ3Y2UzMWYyODYxOGJiYThlNTBhZjM5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxTbmFwT2Zmc2V0c0lu Zm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbFNuYXBPZmZz ZXRzSW5mby5jcHAKQEAgLTI4OCw2ICsyODgsOCBAQCB2b2lkIHVwZGF0ZVNuYXBPZmZzZXRzRm9y U2Nyb2xsYWJsZUFyZWEoU2Nyb2xsYWJsZUFyZWEmIHNjcm9sbGFibGVBcmVhLCBjb25zdCBSZQog CiAgICAgYXV0byBhZGRPclVwZGF0ZVN0b3BGb3JTbmFwT2Zmc2V0ID0gW10oSGFzaE1hcDxMYXlv dXRVbml0LCBTbmFwT2Zmc2V0PExheW91dFVuaXQ+PiYgb2Zmc2V0cywgTGF5b3V0VW5pdCBuZXdP ZmZzZXQsIFNjcm9sbFNuYXBTdG9wIHN0b3AsIGJvb2wgaGFzU25hcEFyZWFMYXJnZXJUaGFuVmll d3BvcnQsIHNpemVfdCBzbmFwQXJlYUluZGljZXMpCiAgICAgeworICAgICAgICBpZiAoIW9mZnNl dHMuaXNWYWxpZEtleShuZXdPZmZzZXQpKQorICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBh dXRvIG9mZnNldCA9IG9mZnNldHMuZW5zdXJlKG5ld09mZnNldCwgWyZdIHsKICAgICAgICAgICAg IHJldHVybiBTbmFwT2Zmc2V0PExheW91dFVuaXQ+IHsgbmV3T2Zmc2V0LCBzdG9wLCBoYXNTbmFw QXJlYUxhcmdlclRoYW5WaWV3cG9ydCwgeyB9IH07CiAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvY3NzMy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1sYXJnZS1vZmZzZXQtY3Jh c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9zY3JvbGwtc25hcC9zY3JvbGwtc25h cC1sYXJnZS1vZmZzZXQtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY0YjkwMTU1YjIw OTI4ZWU1YTkxYjkxM2I4YjczZTEzZjMyMzM2YWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9jc3MzL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdlLW9mZnNldC1jcmFzaC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwxMiBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSAzMzU1NDQzMXgx NzgyCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSAweDU4NQorbGF5ZXIgYXQgKC0zMzU1NDQz MSwwKSBzaXplIDMzNTU0NDMxeDU4NSBiYWNrZ3JvdW5kQ2xpcCBhdCAoMCwwKSBzaXplIDMzNTU0 NDMxeDE3ODIgY2xpcCBhdCAoMCwwKSBzaXplIDMzNTU0NDMxeDE3ODIKKyAgUmVuZGVyQmxvY2sg e0hUTUx9IGF0ICgwLDApIHNpemUgMzM1NTQ0MzF4NTg1CisgICAgUmVuZGVyRGVwcmVjYXRlZEZs ZXhpYmxlQm94IHtCT0RZfSBhdCAoOCwzMzIpIHNpemUgMzM1NTQ0MjN4MTA0CisgICAgICBSZW5k ZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCwwKSBzaXplIDMzNTU0NDI4eDEwNAorICAgICAgICBS ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gge0RJVn0gYXQgKDAsMCkgc2l6ZSAzMzU1NDQyOHgw CisgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgICBS ZW5kZXJIVE1MQ2FudmFzIHtDQU5WQVN9IGF0ICgwLDApIHNpemUgMTAweDEwMAorICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDEwMCw4Nikgc2l6ZSAyNDB4MTgKKyAgICAgICAgICB0ZXh0 IHJ1biBhdCAoMTAwLDg2KSB3aWR0aCA0OiAiICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTA0 LDg2KSB3aWR0aCAyMzY6ICJQQVNTRUQgKElmIHRoaXMgcGFnZSBkaWQgbm90IGNyYXNoLikiCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL3Njcm9sbC1zbmFwL3Njcm9sbC1zbmFwLWxhcmdl LW9mZnNldC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9zY3JvbGwtc25hcC9zY3JvbGwt c25hcC1sYXJnZS1vZmZzZXQtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lYWRiODY5YTA2MWU2Yjcy NzA0OWFkZjc5ODUxNTkzOWI1ZTlkN2NjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv Y3NzMy9zY3JvbGwtc25hcC9zY3JvbGwtc25hcC1sYXJnZS1vZmZzZXQtY3Jhc2guaHRtbApAQCAt MCwwICsxLDMwIEBACis8aHRtbD4KKzxoZWFkPgorICA8c3R5bGU+CisgICAgaHRtbCB7CisgICAg ICB3cml0aW5nLW1vZGU6IHRiLXJsOworICAgIH0KKyAgICA6Zmlyc3Qtb2YtdHlwZSB7CisgICAg ICBkaXNwbGF5OiAtd2Via2l0LWlubGluZS1ib3g7CisgICAgfQorICAgIGhlYWQgeworICAgICAg c2NhbGU6IDEwOworICAgIH0KKyAgICBib2R5IHsKKyAgICAgIHNjcm9sbC1zbmFwLWFsaWduOiBj ZW50ZXI7CisgICAgICBzY3JvbGwtc25hcC10eXBlOiB4OworICAgIH0KKyAgICBib2R5Ojotd2Vi a2l0LXNjcm9sbGJhciB7CisgICAgICBpbmxpbmUtc2l6ZTogMjUwMHB4OworICAgIH0KKyAgICBk aXYgeworICAgICAgd2lkdGg6IDIxNDc0ODM2NDdweDsKKyAgICB9CisgIDwvc3R5bGU+Cis8Ym9k eT4KKyAgPGRpdj48L2Rpdj4KKyAgPGNhbnZhcyBpZD0idGVzdCIgd2lkdGg9IjEwMCIgaGVpZ2h0 PSIxMDAiPjwvY2FudmFzPgorICAgIFBBU1NFRCAoSWYgdGhpcyBwYWdlIGRpZCBub3QgY3Jhc2gu KQorPC9ib2R5PgorCis8L2hlYWQ+Cg==