240036 2022-05-03 13:58:24 -0700 Enable TextCheckingType::Correction on MacCatalyst. 2022-05-04 01:34:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner ews-watchlist mifenton webkit-bug-importer wenson_hsieh oldest_to_newest 1866231 0 megan_gardner 2022-05-03 13:58:24 -0700 Enable TextCheckingType::Correction on MacCatalyst. 1866233 1 458755 megan_gardner 2022-05-03 14:00:11 -0700 Created attachment 458755 Patch 1866235 2 wenson_hsieh 2022-05-03 14:03:22 -0700 rdar://92691014 1866281 3 458755 wenson_hsieh 2022-05-03 15:27:45 -0700 Comment on attachment 458755 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458755&action=review > Source/WebCore/editing/Editor.cpp:2886 > + for (const auto& range : previousGrammarRanges) { > + if (range.location == resultLocation && range.length == resultLength) { > + resultRangeIsAcceptableForReplacement = true; > + break; > + } > + } Nit - might be cleaner as ``` resultRangeIsAcceptableForReplacement = previousGrammarRanges.containsIf([&](auto& range) { return range.location == resultLocation && range.length == resultLength; }); ``` > Source/WebCore/editing/Editor.cpp:2909 > + previousGrammarRanges.append(CharacterRange(resultLocation + detail.range.location, detail.range.length)); Nit - I think we normally write this as `previousGrammarRanges.append({ resultLocation + detail.range.location, detail.range.length });`. 1866366 4 458772 megan_gardner 2022-05-03 22:58:32 -0700 Created attachment 458772 Patch 1866376 5 458774 megan_gardner 2022-05-03 23:22:50 -0700 Created attachment 458774 Patch for landing 1866390 6 ews-feeder 2022-05-04 01:34:57 -0700 Committed r293766 (250245@main): <https://commits.webkit.org/250245@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458774. 458755 2022-05-03 14:00:11 -0700 2022-05-03 23:22:46 -0700 Patch bug-240036-20220503140010.patch text/plain 7773 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg1NzdjOWQwMDg3ZGU2 NjhhM2RhODA1NmZlZjZiOTBiZTcyZjI1My4uOWU1MDc5ZTAxM2JmNGZkMzNlMjliNjEwNmRiY2Nl MjA0MTRlYzEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA1LTAzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIFRl eHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24gb24gTWFjQ2F0YWx5c3QuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAwMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgVGV4dENoZWNraW5nVHlwZTo6 Q29ycmVjdGlvbiB0byBDYXRhbHlzdCB0byBicmluZyBjb25zaXN0ZW5jeSB0byBtYWNPUy4KKwor ICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 bWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nVG9Xb3JkKToKKyAgICAgICAgKFdlYkNvcmU6OkVk aXRvcjo6bWFya0FuZFJlcGxhY2VGb3IpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZXNv bHZlVGV4dENoZWNraW5nVHlwZU1hc2spOgorCiAyMDIyLTA1LTAzICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYnVnZ3kgYXNzZXJ0IGluIENvcmVBdWRp b1NoYXJlZFVuaXQ6OmNvbmZpZ3VyZVNwZWFrZXJQcm9jCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzODc1NTljNjAx NGQwOTYxZWViMjRmMjY4N2FlNmE1ZTVhMmQ5NjEuLmE3NDdjZTlkMGU0ODk2YTI1YWQzMjQyOTU2 Y2Q4YjNmM2EyM2NjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDUtMDMgIE1l Z2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBFbmFibGUg VGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbiBvbiBNYWNDYXRhbHlzdC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDAzNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBUZXh0Q2hlY2tpbmdUeXBl OjpDb3JyZWN0aW9uIHRvIENhdGFseXN0IHRvIGJyaW5nIGNvbnNpc3RlbmN5IHRvIG1hY09TLgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9UZXh0Q2hlY2tlcklPUy5tbToKKyAgICAgICAgKFdl YktpdDo6VGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKToKKwogMjAyMi0wNS0wMyAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBU aGUgIkNvcHkgQ3JvcHBlZCBJbWFnZSIgY29udGV4dCBtZW51IGFjdGlvbiBzaG91bGQgYmUgZ2F0 ZWQgb24gY3JvcHBlZCBpbWFnZSByZXN1bHRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5k ZXggNzZlYjhmZmZiZTM5ZmVlZmQ1ODhiMjUyMmMzMjQ2ZmEyNDUwNjc1Zi4uNWYwMTFkMmM0NTI1 NzI1OTcxZGJhNjJmOWM0ODcwMjAwY2QyNTBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw cApAQCAtMjU0Niw2ICsyNTQ2LDcgQEAgdm9pZCBFZGl0b3I6Om1hcmtNaXNzcGVsbGluZ3NBZnRl clR5cGluZ1RvV29yZChjb25zdCBWaXNpYmxlUG9zaXRpb24mIHdvcmRTdGFydCwKICNpZiBFTkFC TEUoTUFDX0NBVEFMWVNUX0dSQU1NQVJfQ0hFQ0tJTkcpCiAgICAgaWYgKGlzR3JhbW1hckNoZWNr aW5nRW5hYmxlZCgpKSB7CiAgICAgICAgIHRleHRDaGVja2luZ09wdGlvbnMuYWRkKFRleHRDaGVj a2luZ1R5cGU6OkdyYW1tYXIpOworICAgICAgICB0ZXh0Q2hlY2tpbmdPcHRpb25zLmFkZChUZXh0 Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uKTsKICAgICAgICAgYXV0byBzZW50ZW5jZVN0YXJ0ID0g c3RhcnRPZlNlbnRlbmNlKHdvcmRTdGFydCk7CiAgICAgICAgIGF1dG8gc2VudGVuY2VFbmQgPSBl bmRPZlNlbnRlbmNlKHdvcmRTdGFydCk7CiAgICAgICAgIFZpc2libGVTZWxlY3Rpb24gZnVsbFNl bnRlbmNlKHNlbnRlbmNlU3RhcnQsIHNlbnRlbmNlRW5kKTsKQEAgLTI4NjAsNiArMjg2MSw3IEBA IHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihjb25zdCBTcGVsbENoZWNrUmVxdWVzdCYg cmVxdWVzdCwgY29uc3QgVmVjdG9yPFRlCiAgICAgfQogCiAgICAgaW50IG9mZnNldER1ZVRvUmVw bGFjZW1lbnQgPSAwOworICAgIFZlY3RvcjxDaGFyYWN0ZXJSYW5nZT4gcHJldmlvdXNHcmFtbWFy UmFuZ2VzOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJlc3VsdHMuc2l6ZSgpOyBp KyspIHsKICAgICAgICAgYXV0byBzcGVsbGluZ1JhbmdlRW5kT2Zmc2V0ID0gcGFyYWdyYXBoLmNo ZWNraW5nRW5kKCkgKyBvZmZzZXREdWVUb1JlcGxhY2VtZW50OwpAQCAtMjg3Miw2ICsyODc0LDE5 IEBAIHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihjb25zdCBTcGVsbENoZWNrUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgVmVjdG9yPFRlCiAgICAgICAgIGNvbnN0IFN0cmluZyYgcmVwbGFj ZW1lbnQgPSByZXN1bHRzW2ldLnJlcGxhY2VtZW50OwogICAgICAgICBib29sIHJlc3VsdEVuZHNB dEFtYmlndW91c0JvdW5kYXJ5ID0gdXNlQW1iaWd1b3VzQm91bmRhcnlPZmZzZXQgJiYgc2VsZWN0 aW9uT2Zmc2V0IC0gMSA8PSByZXN1bHRFbmRMb2NhdGlvbjsKIAorICAgICAgICBib29sIHJlc3Vs dFJhbmdlSXNBY2NlcHRhYmxlRm9yUmVwbGFjZW1lbnQgPSBhdXRvbWF0aWNSZXBsYWNlbWVudFN0 YXJ0TG9jYXRpb24gPD0gcmVzdWx0RW5kTG9jYXRpb24gJiYgcmVzdWx0RW5kTG9jYXRpb24gPD0g YXV0b21hdGljUmVwbGFjZW1lbnRFbmRMb2NhdGlvbjsKKyAgICAgICAgLy8gSW4gdGhpcyBjYXNl IHRoZSByZXN1bHQgcmFuZ2UganVzdCBoYXMgdG8gdG91Y2ggdGhlIGF1dG9tYXRpYyByZXBsYWNl bWVudCByYW5nZSwgc28gd2UgY2FuIGhhbmRsZSByZXBsYWNpbmcgbm9uLXdvcmQgdGV4dCBzdWNo IGFzIHB1bmN0dWF0aW9uLgorI2lmIEVOQUJMRShNQUNfQ0FUQUxZU1RfR1JBTU1BUl9DSEVDS0lO RykKKyAgICAgICAgaWYgKCFyZXN1bHRSYW5nZUlzQWNjZXB0YWJsZUZvclJlcGxhY2VtZW50ICYm IHNob3VsZE1hcmtHcmFtbWFyICYmIHNob3VsZENoZWNrRm9yQ29ycmVjdGlvbiAmJiByZXN1bHRU eXBlID09IFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24pIHsKKyAgICAgICAgICAgIGZvciAo Y29uc3QgYXV0byYgcmFuZ2UgOiBwcmV2aW91c0dyYW1tYXJSYW5nZXMpIHsKKyAgICAgICAgICAg ICAgICBpZiAocmFuZ2UubG9jYXRpb24gPT0gcmVzdWx0TG9jYXRpb24gJiYgcmFuZ2UubGVuZ3Ro ID09IHJlc3VsdExlbmd0aCkgeworICAgICAgICAgICAgICAgICAgICByZXN1bHRSYW5nZUlzQWNj ZXB0YWJsZUZvclJlcGxhY2VtZW50ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisjZW5kaWYKKwog ICAgICAgICAvLyBPbmx5IG1hcmsgbWlzc3BlbGxpbmcgaWY6CiAgICAgICAgIC8vIDEuIEN1cnJl bnQgdGV4dCBjaGVja2luZyBpc24ndCBkb25lIGZvciBhdXRvY29ycmVjdGlvbiwgaW4gd2hpY2gg Y2FzZSBzaG91bGRNYXJrU3BlbGxpbmcgaXMgZmFsc2UuCiAgICAgICAgIC8vIDIuIFJlc3VsdCBm YWxscyB3aXRoaW4gc3BlbGxpbmdSYW5nZS4KQEAgLTI4OTEsMTEgKzI5MDYsMTAgQEAgdm9pZCBF ZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKGNvbnN0IFNwZWxsQ2hlY2tSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBWZWN0b3I8VGUKICAgICAgICAgICAgICAgICBpZiAocGFyYWdyYXBoLmNoZWNraW5n UmFuZ2VDb3ZlcnMoeyByZXN1bHRMb2NhdGlvbiArIGRldGFpbC5yYW5nZS5sb2NhdGlvbiwgZGV0 YWlsLnJhbmdlLmxlbmd0aCB9KSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvIGJhZEdyYW1t YXJSYW5nZSA9IHBhcmFncmFwaC5zdWJyYW5nZSh7IHJlc3VsdExvY2F0aW9uICsgZGV0YWlsLnJh bmdlLmxvY2F0aW9uLCBkZXRhaWwucmFuZ2UubGVuZ3RoIH0pOwogICAgICAgICAgICAgICAgICAg ICBhZGRNYXJrZXIoYmFkR3JhbW1hclJhbmdlLCBEb2N1bWVudE1hcmtlcjo6R3JhbW1hciwgZGV0 YWlsLnVzZXJEZXNjcmlwdGlvbik7CisgICAgICAgICAgICAgICAgICAgIHByZXZpb3VzR3JhbW1h clJhbmdlcy5hcHBlbmQoQ2hhcmFjdGVyUmFuZ2UocmVzdWx0TG9jYXRpb24gKyBkZXRhaWwucmFu Z2UubG9jYXRpb24sIGRldGFpbC5yYW5nZS5sZW5ndGgpKTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBpZiAoYXV0b21hdGljUmVwbGFjZW1lbnRTdGFy dExvY2F0aW9uIDw9IHJlc3VsdEVuZExvY2F0aW9uICYmIHJlc3VsdEVuZExvY2F0aW9uIDw9IGF1 dG9tYXRpY1JlcGxhY2VtZW50RW5kTG9jYXRpb24KLSAgICAgICAgICAgICYmIGlzQXV0b21hdGlj VGV4dFJlcGxhY2VtZW50VHlwZShyZXN1bHRUeXBlKSkgewotICAgICAgICAgICAgLy8gSW4gdGhp cyBjYXNlIHRoZSByZXN1bHQgcmFuZ2UganVzdCBoYXMgdG8gdG91Y2ggdGhlIGF1dG9tYXRpYyBy ZXBsYWNlbWVudCByYW5nZSwgc28gd2UgY2FuIGhhbmRsZSByZXBsYWNpbmcgbm9uLXdvcmQgdGV4 dCBzdWNoIGFzIHB1bmN0dWF0aW9uLgorICAgICAgICB9IGVsc2UgaWYgKHJlc3VsdFJhbmdlSXNB Y2NlcHRhYmxlRm9yUmVwbGFjZW1lbnQgJiYgaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRUeXBl KHJlc3VsdFR5cGUpKSB7CiAgICAgICAgICAgICBBU1NFUlQocmVzdWx0TGVuZ3RoID4gMCk7CiAK ICAgICAgICAgICAgIGlmIChzaG91bGRTaG93Q29ycmVjdGlvblBhbmVsICYmIChyZXN1bHRFbmRM b2NhdGlvbiA8IGF1dG9tYXRpY1JlcGxhY2VtZW50RW5kTG9jYXRpb24KQEAgLTM5MjQsNiArMzkz OCw4IEBAIE9wdGlvblNldDxUZXh0Q2hlY2tpbmdUeXBlPiBFZGl0b3I6OnJlc29sdmVUZXh0Q2hl Y2tpbmdUeXBlTWFzayhjb25zdCBOb2RlJiByb290CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgYm9vbCBzaG91bGRTaG93Q29ycmVjdGlvblBhbmVsID0gdGV4dENoZWNraW5nT3B0aW9u cy5jb250YWlucyhUZXh0Q2hlY2tpbmdUeXBlOjpTaG93Q29ycmVjdGlvblBhbmVsKTsKICAgICBi b29sIHNob3VsZENoZWNrRm9yQ29ycmVjdGlvbiA9IHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwg fHwgdGV4dENoZWNraW5nT3B0aW9ucy5jb250YWlucyhUZXh0Q2hlY2tpbmdUeXBlOjpDb3JyZWN0 aW9uKTsKKyNlbHNlCisgICAgYm9vbCBzaG91bGRDaGVja0ZvckNvcnJlY3Rpb24gPSB0ZXh0Q2hl Y2tpbmdPcHRpb25zLmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24pOwogI2Vu ZGlmCiAKICAgICBPcHRpb25TZXQ8VGV4dENoZWNraW5nVHlwZT4gY2hlY2tpbmdUeXBlczsKQEAg LTM5MzEsOSArMzk0Nyw5IEBAIE9wdGlvblNldDxUZXh0Q2hlY2tpbmdUeXBlPiBFZGl0b3I6OnJl c29sdmVUZXh0Q2hlY2tpbmdUeXBlTWFzayhjb25zdCBOb2RlJiByb290CiAgICAgICAgIGNoZWNr aW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5cGU6OlNwZWxsaW5nKTsKICAgICBpZiAoc2hvdWxk TWFya0dyYW1tYXIpCiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5cGU6 OkdyYW1tYXIpOwotI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChzaG91bGRDaGVj a0ZvckNvcnJlY3Rpb24pCiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5 cGU6OkNvcnJlY3Rpb24pOworI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChzaG91 bGRTaG93Q29ycmVjdGlvblBhbmVsKQogICAgICAgICBjaGVja2luZ1R5cGVzLmFkZChUZXh0Q2hl Y2tpbmdUeXBlOjpTaG93Q29ycmVjdGlvblBhbmVsKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1RleHRDaGVja2VySU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1RleHRDaGVja2VySU9TLm1tCmluZGV4IDAxYTE2N2E3OGUzN2NkM2NkZjRiMTZj ZWViOTg1YmZhNWI1NWM2NmMuLjExMTVhNjU2NGViM2M1YTM5MjBlZDgxMDhjNWVhZDdlYWQ1YWRi OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9UZXh0Q2hlY2tlcklP Uy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvVGV4dENoZWNrZXJJT1MubW0K QEAgLTIyOCw2ICsyMjgsOCBAQCBWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0PiBUZXh0Q2hlY2tl cjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoU3BlbGxEb2N1bWVudFRhZyBzcAogICAgICAgICAgICAg dHlwZXMgfD0gTlNUZXh0Q2hlY2tpbmdUeXBlU3BlbGxpbmc7CiAgICAgICAgIGlmIChjaGVja2lu Z1R5cGVzLmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6OkdyYW1tYXIpKQogICAgICAgICAgICAg dHlwZXMgfD0gTlNUZXh0Q2hlY2tpbmdUeXBlR3JhbW1hcjsKKyAgICAgICAgaWYgKGNoZWNraW5n VHlwZXMuY29udGFpbnMoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbikpCisgICAgICAgICAg ICB0eXBlcyB8PSBOU1RleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uOwogICAgICAgICBOU0RpY3Rp b25hcnkgKm9wdGlvbnMgPSBAewogICAgICAgICAgICAgQCJJbnNlcnRpb25Qb2ludCIgOiBAKGlu c2VydGlvblBvaW50KQogICAgICAgICB9OwpAQCAtMjY1LDYgKzI2NywxMiBAQCBWZWN0b3I8VGV4 dENoZWNraW5nUmVzdWx0PiBUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoU3BlbGxE b2N1bWVudFRhZyBzcAogICAgICAgICAgICAgICAgICAgICByZXN1bHQuZGV0YWlscy51bmNoZWNr ZWRBcHBlbmQoV1RGTW92ZShkZXRhaWwpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgcmVzdWx0cy5hcHBlbmQoV1RGTW92ZShyZXN1bHQpKTsKKyAgICAgICAgICAgIH0gZWxz ZSBpZiAocmVzdWx0VHlwZSA9PSBOU1RleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uICYmIGNoZWNr aW5nVHlwZXMuY29udGFpbnMoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbikpIHsKKyAgICAg ICAgICAgICAgICBUZXh0Q2hlY2tpbmdSZXN1bHQgcmVzdWx0OworICAgICAgICAgICAgICAgIHJl c3VsdC50eXBlID0gVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbjsKKyAgICAgICAgICAgICAg ICByZXN1bHQucmFuZ2UgPSByZXN1bHRSYW5nZTsKKyAgICAgICAgICAgICAgICByZXN1bHQucmVw bGFjZW1lbnQgPSBbaW5jb21pbmdSZXN1bHQgcmVwbGFjZW1lbnRTdHJpbmddOworICAgICAgICAg ICAgICAgIHJlc3VsdHMuYXBwZW5kKFdURk1vdmUocmVzdWx0KSk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9IGVsc2UK 458772 2022-05-03 22:58:32 -0700 2022-05-03 23:22:48 -0700 Patch bug-240036-20220503235831.patch text/plain 7704 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg1NzdjOWQwMDg3ZGU2 NjhhM2RhODA1NmZlZjZiOTBiZTcyZjI1My4uOWU1MDc5ZTAxM2JmNGZkMzNlMjliNjEwNmRiY2Nl MjA0MTRlYzEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA1LTAzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIFRl eHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24gb24gTWFjQ2F0YWx5c3QuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAwMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgVGV4dENoZWNraW5nVHlwZTo6 Q29ycmVjdGlvbiB0byBDYXRhbHlzdCB0byBicmluZyBjb25zaXN0ZW5jeSB0byBtYWNPUy4KKwor ICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 bWFya01pc3NwZWxsaW5nc0FmdGVyVHlwaW5nVG9Xb3JkKToKKyAgICAgICAgKFdlYkNvcmU6OkVk aXRvcjo6bWFya0FuZFJlcGxhY2VGb3IpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZXNv bHZlVGV4dENoZWNraW5nVHlwZU1hc2spOgorCiAyMDIyLTA1LTAzICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYnVnZ3kgYXNzZXJ0IGluIENvcmVBdWRp b1NoYXJlZFVuaXQ6OmNvbmZpZ3VyZVNwZWFrZXJQcm9jCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzODc1NTljNjAx NGQwOTYxZWViMjRmMjY4N2FlNmE1ZTVhMmQ5NjEuLmE3NDdjZTlkMGU0ODk2YTI1YWQzMjQyOTU2 Y2Q4YjNmM2EyM2NjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjItMDUtMDMgIE1l Z2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBFbmFibGUg VGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbiBvbiBNYWNDYXRhbHlzdC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDAzNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBUZXh0Q2hlY2tpbmdUeXBl OjpDb3JyZWN0aW9uIHRvIENhdGFseXN0IHRvIGJyaW5nIGNvbnNpc3RlbmN5IHRvIG1hY09TLgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9UZXh0Q2hlY2tlcklPUy5tbToKKyAgICAgICAgKFdl YktpdDo6VGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKToKKwogMjAyMi0wNS0wMyAg V2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBU aGUgIkNvcHkgQ3JvcHBlZCBJbWFnZSIgY29udGV4dCBtZW51IGFjdGlvbiBzaG91bGQgYmUgZ2F0 ZWQgb24gY3JvcHBlZCBpbWFnZSByZXN1bHRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5k ZXggNzZlYjhmZmZiZTM5ZmVlZmQ1ODhiMjUyMmMzMjQ2ZmEyNDUwNjc1Zi4uZDE5ODAxYWJjNjEw ZjkxZjdmZTFjNjE1NzVlZTQ3NmJmZDA0NGUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw cApAQCAtMjU0Niw2ICsyNTQ2LDcgQEAgdm9pZCBFZGl0b3I6Om1hcmtNaXNzcGVsbGluZ3NBZnRl clR5cGluZ1RvV29yZChjb25zdCBWaXNpYmxlUG9zaXRpb24mIHdvcmRTdGFydCwKICNpZiBFTkFC TEUoTUFDX0NBVEFMWVNUX0dSQU1NQVJfQ0hFQ0tJTkcpCiAgICAgaWYgKGlzR3JhbW1hckNoZWNr aW5nRW5hYmxlZCgpKSB7CiAgICAgICAgIHRleHRDaGVja2luZ09wdGlvbnMuYWRkKFRleHRDaGVj a2luZ1R5cGU6OkdyYW1tYXIpOworICAgICAgICB0ZXh0Q2hlY2tpbmdPcHRpb25zLmFkZChUZXh0 Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uKTsKICAgICAgICAgYXV0byBzZW50ZW5jZVN0YXJ0ID0g c3RhcnRPZlNlbnRlbmNlKHdvcmRTdGFydCk7CiAgICAgICAgIGF1dG8gc2VudGVuY2VFbmQgPSBl bmRPZlNlbnRlbmNlKHdvcmRTdGFydCk7CiAgICAgICAgIFZpc2libGVTZWxlY3Rpb24gZnVsbFNl bnRlbmNlKHNlbnRlbmNlU3RhcnQsIHNlbnRlbmNlRW5kKTsKQEAgLTI4NjAsNiArMjg2MSw3IEBA IHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihjb25zdCBTcGVsbENoZWNrUmVxdWVzdCYg cmVxdWVzdCwgY29uc3QgVmVjdG9yPFRlCiAgICAgfQogCiAgICAgaW50IG9mZnNldER1ZVRvUmVw bGFjZW1lbnQgPSAwOworICAgIFZlY3RvcjxDaGFyYWN0ZXJSYW5nZT4gcHJldmlvdXNHcmFtbWFy UmFuZ2VzOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJlc3VsdHMuc2l6ZSgpOyBp KyspIHsKICAgICAgICAgYXV0byBzcGVsbGluZ1JhbmdlRW5kT2Zmc2V0ID0gcGFyYWdyYXBoLmNo ZWNraW5nRW5kKCkgKyBvZmZzZXREdWVUb1JlcGxhY2VtZW50OwpAQCAtMjg3Miw2ICsyODc0LDE2 IEBAIHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihjb25zdCBTcGVsbENoZWNrUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgVmVjdG9yPFRlCiAgICAgICAgIGNvbnN0IFN0cmluZyYgcmVwbGFj ZW1lbnQgPSByZXN1bHRzW2ldLnJlcGxhY2VtZW50OwogICAgICAgICBib29sIHJlc3VsdEVuZHNB dEFtYmlndW91c0JvdW5kYXJ5ID0gdXNlQW1iaWd1b3VzQm91bmRhcnlPZmZzZXQgJiYgc2VsZWN0 aW9uT2Zmc2V0IC0gMSA8PSByZXN1bHRFbmRMb2NhdGlvbjsKIAorICAgICAgICBib29sIHJlc3Vs dFJhbmdlSXNBY2NlcHRhYmxlRm9yUmVwbGFjZW1lbnQgPSBhdXRvbWF0aWNSZXBsYWNlbWVudFN0 YXJ0TG9jYXRpb24gPD0gcmVzdWx0RW5kTG9jYXRpb24gJiYgcmVzdWx0RW5kTG9jYXRpb24gPD0g YXV0b21hdGljUmVwbGFjZW1lbnRFbmRMb2NhdGlvbjsKKyAgICAgICAgLy8gSW4gdGhpcyBjYXNl IHRoZSByZXN1bHQgcmFuZ2UganVzdCBoYXMgdG8gdG91Y2ggdGhlIGF1dG9tYXRpYyByZXBsYWNl bWVudCByYW5nZSwgc28gd2UgY2FuIGhhbmRsZSByZXBsYWNpbmcgbm9uLXdvcmQgdGV4dCBzdWNo IGFzIHB1bmN0dWF0aW9uLgorI2lmIEVOQUJMRShNQUNfQ0FUQUxZU1RfR1JBTU1BUl9DSEVDS0lO RykKKyAgICAgICAgaWYgKCFyZXN1bHRSYW5nZUlzQWNjZXB0YWJsZUZvclJlcGxhY2VtZW50ICYm IHNob3VsZE1hcmtHcmFtbWFyICYmIHNob3VsZENoZWNrRm9yQ29ycmVjdGlvbiAmJiByZXN1bHRU eXBlID09IFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24pIHsKKyAgICAgICAgICAgIHJlc3Vs dFJhbmdlSXNBY2NlcHRhYmxlRm9yUmVwbGFjZW1lbnQgPSBwcmV2aW91c0dyYW1tYXJSYW5nZXMu Y29udGFpbnNJZihbJl0oYXV0byYgcmFuZ2UpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcmFu Z2UubG9jYXRpb24gPT0gcmVzdWx0TG9jYXRpb24gJiYgcmFuZ2UubGVuZ3RoID09IHJlc3VsdExl bmd0aDsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisjZW5kaWYKKwogICAgICAgICAvLyBP bmx5IG1hcmsgbWlzc3BlbGxpbmcgaWY6CiAgICAgICAgIC8vIDEuIEN1cnJlbnQgdGV4dCBjaGVj a2luZyBpc24ndCBkb25lIGZvciBhdXRvY29ycmVjdGlvbiwgaW4gd2hpY2ggY2FzZSBzaG91bGRN YXJrU3BlbGxpbmcgaXMgZmFsc2UuCiAgICAgICAgIC8vIDIuIFJlc3VsdCBmYWxscyB3aXRoaW4g c3BlbGxpbmdSYW5nZS4KQEAgLTI4OTEsMTEgKzI5MDMsMTAgQEAgdm9pZCBFZGl0b3I6Om1hcmtB bmRSZXBsYWNlRm9yKGNvbnN0IFNwZWxsQ2hlY2tSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBWZWN0 b3I8VGUKICAgICAgICAgICAgICAgICBpZiAocGFyYWdyYXBoLmNoZWNraW5nUmFuZ2VDb3ZlcnMo eyByZXN1bHRMb2NhdGlvbiArIGRldGFpbC5yYW5nZS5sb2NhdGlvbiwgZGV0YWlsLnJhbmdlLmxl bmd0aCB9KSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvIGJhZEdyYW1tYXJSYW5nZSA9IHBh cmFncmFwaC5zdWJyYW5nZSh7IHJlc3VsdExvY2F0aW9uICsgZGV0YWlsLnJhbmdlLmxvY2F0aW9u LCBkZXRhaWwucmFuZ2UubGVuZ3RoIH0pOwogICAgICAgICAgICAgICAgICAgICBhZGRNYXJrZXIo YmFkR3JhbW1hclJhbmdlLCBEb2N1bWVudE1hcmtlcjo6R3JhbW1hciwgZGV0YWlsLnVzZXJEZXNj cmlwdGlvbik7CisgICAgICAgICAgICAgICAgICAgIHByZXZpb3VzR3JhbW1hclJhbmdlcy5hcHBl bmQoQ2hhcmFjdGVyUmFuZ2UocmVzdWx0TG9jYXRpb24gKyBkZXRhaWwucmFuZ2UubG9jYXRpb24s IGRldGFpbC5yYW5nZS5sZW5ndGgpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 Ci0gICAgICAgIH0gZWxzZSBpZiAoYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydExvY2F0aW9uIDw9 IHJlc3VsdEVuZExvY2F0aW9uICYmIHJlc3VsdEVuZExvY2F0aW9uIDw9IGF1dG9tYXRpY1JlcGxh Y2VtZW50RW5kTG9jYXRpb24KLSAgICAgICAgICAgICYmIGlzQXV0b21hdGljVGV4dFJlcGxhY2Vt ZW50VHlwZShyZXN1bHRUeXBlKSkgewotICAgICAgICAgICAgLy8gSW4gdGhpcyBjYXNlIHRoZSBy ZXN1bHQgcmFuZ2UganVzdCBoYXMgdG8gdG91Y2ggdGhlIGF1dG9tYXRpYyByZXBsYWNlbWVudCBy YW5nZSwgc28gd2UgY2FuIGhhbmRsZSByZXBsYWNpbmcgbm9uLXdvcmQgdGV4dCBzdWNoIGFzIHB1 bmN0dWF0aW9uLgorICAgICAgICB9IGVsc2UgaWYgKHJlc3VsdFJhbmdlSXNBY2NlcHRhYmxlRm9y UmVwbGFjZW1lbnQgJiYgaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRUeXBlKHJlc3VsdFR5cGUp KSB7CiAgICAgICAgICAgICBBU1NFUlQocmVzdWx0TGVuZ3RoID4gMCk7CiAKICAgICAgICAgICAg IGlmIChzaG91bGRTaG93Q29ycmVjdGlvblBhbmVsICYmIChyZXN1bHRFbmRMb2NhdGlvbiA8IGF1 dG9tYXRpY1JlcGxhY2VtZW50RW5kTG9jYXRpb24KQEAgLTM5MjQsNiArMzkzNSw4IEBAIE9wdGlv blNldDxUZXh0Q2hlY2tpbmdUeXBlPiBFZGl0b3I6OnJlc29sdmVUZXh0Q2hlY2tpbmdUeXBlTWFz ayhjb25zdCBOb2RlJiByb290CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgYm9vbCBz aG91bGRTaG93Q29ycmVjdGlvblBhbmVsID0gdGV4dENoZWNraW5nT3B0aW9ucy5jb250YWlucyhU ZXh0Q2hlY2tpbmdUeXBlOjpTaG93Q29ycmVjdGlvblBhbmVsKTsKICAgICBib29sIHNob3VsZENo ZWNrRm9yQ29ycmVjdGlvbiA9IHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwgfHwgdGV4dENoZWNr aW5nT3B0aW9ucy5jb250YWlucyhUZXh0Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uKTsKKyNlbHNl CisgICAgYm9vbCBzaG91bGRDaGVja0ZvckNvcnJlY3Rpb24gPSB0ZXh0Q2hlY2tpbmdPcHRpb25z LmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24pOwogI2VuZGlmCiAKICAgICBP cHRpb25TZXQ8VGV4dENoZWNraW5nVHlwZT4gY2hlY2tpbmdUeXBlczsKQEAgLTM5MzEsOSArMzk0 NCw5IEBAIE9wdGlvblNldDxUZXh0Q2hlY2tpbmdUeXBlPiBFZGl0b3I6OnJlc29sdmVUZXh0Q2hl Y2tpbmdUeXBlTWFzayhjb25zdCBOb2RlJiByb290CiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRk KFRleHRDaGVja2luZ1R5cGU6OlNwZWxsaW5nKTsKICAgICBpZiAoc2hvdWxkTWFya0dyYW1tYXIp CiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5cGU6OkdyYW1tYXIpOwot I2lmICFQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChzaG91bGRDaGVja0ZvckNvcnJlY3Rp b24pCiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rp b24pOworI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChzaG91bGRTaG93Q29ycmVj dGlvblBhbmVsKQogICAgICAgICBjaGVja2luZ1R5cGVzLmFkZChUZXh0Q2hlY2tpbmdUeXBlOjpT aG93Q29ycmVjdGlvblBhbmVsKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1RleHRDaGVja2VySU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Rl eHRDaGVja2VySU9TLm1tCmluZGV4IDAxYTE2N2E3OGUzN2NkM2NkZjRiMTZjZWViOTg1YmZhNWI1 NWM2NmMuLjExMTVhNjU2NGViM2M1YTM5MjBlZDgxMDhjNWVhZDdlYWQ1YWRiOTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9UZXh0Q2hlY2tlcklPUy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvVGV4dENoZWNrZXJJT1MubW0KQEAgLTIyOCw2ICsy MjgsOCBAQCBWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0PiBUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0 T2ZQYXJhZ3JhcGgoU3BlbGxEb2N1bWVudFRhZyBzcAogICAgICAgICAgICAgdHlwZXMgfD0gTlNU ZXh0Q2hlY2tpbmdUeXBlU3BlbGxpbmc7CiAgICAgICAgIGlmIChjaGVja2luZ1R5cGVzLmNvbnRh aW5zKFRleHRDaGVja2luZ1R5cGU6OkdyYW1tYXIpKQogICAgICAgICAgICAgdHlwZXMgfD0gTlNU ZXh0Q2hlY2tpbmdUeXBlR3JhbW1hcjsKKyAgICAgICAgaWYgKGNoZWNraW5nVHlwZXMuY29udGFp bnMoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbikpCisgICAgICAgICAgICB0eXBlcyB8PSBO U1RleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uOwogICAgICAgICBOU0RpY3Rpb25hcnkgKm9wdGlv bnMgPSBAewogICAgICAgICAgICAgQCJJbnNlcnRpb25Qb2ludCIgOiBAKGluc2VydGlvblBvaW50 KQogICAgICAgICB9OwpAQCAtMjY1LDYgKzI2NywxMiBAQCBWZWN0b3I8VGV4dENoZWNraW5nUmVz dWx0PiBUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoU3BlbGxEb2N1bWVudFRhZyBz cAogICAgICAgICAgICAgICAgICAgICByZXN1bHQuZGV0YWlscy51bmNoZWNrZWRBcHBlbmQoV1RG TW92ZShkZXRhaWwpKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmVzdWx0 cy5hcHBlbmQoV1RGTW92ZShyZXN1bHQpKTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAocmVzdWx0 VHlwZSA9PSBOU1RleHRDaGVja2luZ1R5cGVDb3JyZWN0aW9uICYmIGNoZWNraW5nVHlwZXMuY29u dGFpbnMoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbikpIHsKKyAgICAgICAgICAgICAgICBU ZXh0Q2hlY2tpbmdSZXN1bHQgcmVzdWx0OworICAgICAgICAgICAgICAgIHJlc3VsdC50eXBlID0g VGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbjsKKyAgICAgICAgICAgICAgICByZXN1bHQucmFu Z2UgPSByZXN1bHRSYW5nZTsKKyAgICAgICAgICAgICAgICByZXN1bHQucmVwbGFjZW1lbnQgPSBb aW5jb21pbmdSZXN1bHQgcmVwbGFjZW1lbnRTdHJpbmddOworICAgICAgICAgICAgICAgIHJlc3Vs dHMuYXBwZW5kKFdURk1vdmUocmVzdWx0KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9IGVsc2UK 458774 2022-05-03 23:22:50 -0700 2022-05-04 01:34:58 -0700 Patch for landing bug-240036-20220504002249.patch text/plain 7700 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg1NzdjOWQwMDg3ZGU2 NjhhM2RhODA1NmZlZjZiOTBiZTcyZjI1My4uMjIwNDI2MjMwYzZmOTVhZmIzMDM0MDg5N2Q2ZDQ5 MWNjZDQ2NjM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTA1LTAzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIFRl eHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24gb24gTWFjQ2F0YWx5c3QuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAwMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgQWRkIFRleHRDaGVja2luZ1R5cGU6OkNv cnJlY3Rpb24gdG8gQ2F0YWx5c3QgdG8gYnJpbmcgY29uc2lzdGVuY3kgdG8gbWFjT1MuCisKKyAg ICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1h cmtNaXNzcGVsbGluZ3NBZnRlclR5cGluZ1RvV29yZCk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0 b3I6Om1hcmtBbmRSZXBsYWNlRm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6cmVzb2x2 ZVRleHRDaGVja2luZ1R5cGVNYXNrKToKKwogMjAyMi0wNS0wMyAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJ1Z2d5IGFzc2VydCBpbiBDb3JlQXVkaW9T aGFyZWRVbml0Ojpjb25maWd1cmVTcGVha2VyUHJvYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBkMzg3NTU5YzYwMTRk MDk2MWVlYjI0ZjI2ODdhZTZhNWU1YTJkOTYxLi40OTA0MzVjMGRiYjYzOGM3MTU0YTQyNjU2MThm M2M3OGUyNGM4YjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA1LTAzICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIFRl eHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24gb24gTWFjQ2F0YWx5c3QuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAwMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgQWRkIFRleHRDaGVja2luZ1R5cGU6OkNv cnJlY3Rpb24gdG8gQ2F0YWx5c3QgdG8gYnJpbmcgY29uc2lzdGVuY3kgdG8gbWFjT1MuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1RleHRDaGVja2VySU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgpOgorCiAyMDIyLTA1LTAzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFRoZSAi Q29weSBDcm9wcGVkIEltYWdlIiBjb250ZXh0IG1lbnUgYWN0aW9uIHNob3VsZCBiZSBnYXRlZCBv biBjcm9wcGVkIGltYWdlIHJlc3VsdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCA3 NmViOGZmZmJlMzlmZWVmZDU4OGIyNTIyYzMyNDZmYTI0NTA2NzVmLi5kMTk4MDFhYmM2MTBmOTFm N2ZlMWM2MTU3NWVlNDc2YmZkMDQ0ZTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBA IC0yNTQ2LDYgKzI1NDYsNyBAQCB2b2lkIEVkaXRvcjo6bWFya01pc3NwZWxsaW5nc0FmdGVyVHlw aW5nVG9Xb3JkKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgd29yZFN0YXJ0LAogI2lmIEVOQUJMRShN QUNfQ0FUQUxZU1RfR1JBTU1BUl9DSEVDS0lORykKICAgICBpZiAoaXNHcmFtbWFyQ2hlY2tpbmdF bmFibGVkKCkpIHsKICAgICAgICAgdGV4dENoZWNraW5nT3B0aW9ucy5hZGQoVGV4dENoZWNraW5n VHlwZTo6R3JhbW1hcik7CisgICAgICAgIHRleHRDaGVja2luZ09wdGlvbnMuYWRkKFRleHRDaGVj a2luZ1R5cGU6OkNvcnJlY3Rpb24pOwogICAgICAgICBhdXRvIHNlbnRlbmNlU3RhcnQgPSBzdGFy dE9mU2VudGVuY2Uod29yZFN0YXJ0KTsKICAgICAgICAgYXV0byBzZW50ZW5jZUVuZCA9IGVuZE9m U2VudGVuY2Uod29yZFN0YXJ0KTsKICAgICAgICAgVmlzaWJsZVNlbGVjdGlvbiBmdWxsU2VudGVu Y2Uoc2VudGVuY2VTdGFydCwgc2VudGVuY2VFbmQpOwpAQCAtMjg2MCw2ICsyODYxLDcgQEAgdm9p ZCBFZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKGNvbnN0IFNwZWxsQ2hlY2tSZXF1ZXN0JiByZXF1 ZXN0LCBjb25zdCBWZWN0b3I8VGUKICAgICB9CiAKICAgICBpbnQgb2Zmc2V0RHVlVG9SZXBsYWNl bWVudCA9IDA7CisgICAgVmVjdG9yPENoYXJhY3RlclJhbmdlPiBwcmV2aW91c0dyYW1tYXJSYW5n ZXM7CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgcmVzdWx0cy5zaXplKCk7IGkrKykg ewogICAgICAgICBhdXRvIHNwZWxsaW5nUmFuZ2VFbmRPZmZzZXQgPSBwYXJhZ3JhcGguY2hlY2tp bmdFbmQoKSArIG9mZnNldER1ZVRvUmVwbGFjZW1lbnQ7CkBAIC0yODcyLDYgKzI4NzQsMTYgQEAg dm9pZCBFZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKGNvbnN0IFNwZWxsQ2hlY2tSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBWZWN0b3I8VGUKICAgICAgICAgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVu dCA9IHJlc3VsdHNbaV0ucmVwbGFjZW1lbnQ7CiAgICAgICAgIGJvb2wgcmVzdWx0RW5kc0F0QW1i aWd1b3VzQm91bmRhcnkgPSB1c2VBbWJpZ3VvdXNCb3VuZGFyeU9mZnNldCAmJiBzZWxlY3Rpb25P ZmZzZXQgLSAxIDw9IHJlc3VsdEVuZExvY2F0aW9uOwogCisgICAgICAgIGJvb2wgcmVzdWx0UmFu Z2VJc0FjY2VwdGFibGVGb3JSZXBsYWNlbWVudCA9IGF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnRM b2NhdGlvbiA8PSByZXN1bHRFbmRMb2NhdGlvbiAmJiByZXN1bHRFbmRMb2NhdGlvbiA8PSBhdXRv bWF0aWNSZXBsYWNlbWVudEVuZExvY2F0aW9uOworICAgICAgICAvLyBJbiB0aGlzIGNhc2UgdGhl IHJlc3VsdCByYW5nZSBqdXN0IGhhcyB0byB0b3VjaCB0aGUgYXV0b21hdGljIHJlcGxhY2VtZW50 IHJhbmdlLCBzbyB3ZSBjYW4gaGFuZGxlIHJlcGxhY2luZyBub24td29yZCB0ZXh0IHN1Y2ggYXMg cHVuY3R1YXRpb24uCisjaWYgRU5BQkxFKE1BQ19DQVRBTFlTVF9HUkFNTUFSX0NIRUNLSU5HKQor ICAgICAgICBpZiAoIXJlc3VsdFJhbmdlSXNBY2NlcHRhYmxlRm9yUmVwbGFjZW1lbnQgJiYgc2hv dWxkTWFya0dyYW1tYXIgJiYgc2hvdWxkQ2hlY2tGb3JDb3JyZWN0aW9uICYmIHJlc3VsdFR5cGUg PT0gVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbikgeworICAgICAgICAgICAgcmVzdWx0UmFu Z2VJc0FjY2VwdGFibGVGb3JSZXBsYWNlbWVudCA9IHByZXZpb3VzR3JhbW1hclJhbmdlcy5jb250 YWluc0lmKFsmXShhdXRvJiByYW5nZSkgeworICAgICAgICAgICAgICAgIHJldHVybiByYW5nZS5s b2NhdGlvbiA9PSByZXN1bHRMb2NhdGlvbiAmJiByYW5nZS5sZW5ndGggPT0gcmVzdWx0TGVuZ3Ro OworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyNlbmRpZgorCiAgICAgICAgIC8vIE9ubHkg bWFyayBtaXNzcGVsbGluZyBpZjoKICAgICAgICAgLy8gMS4gQ3VycmVudCB0ZXh0IGNoZWNraW5n IGlzbid0IGRvbmUgZm9yIGF1dG9jb3JyZWN0aW9uLCBpbiB3aGljaCBjYXNlIHNob3VsZE1hcmtT cGVsbGluZyBpcyBmYWxzZS4KICAgICAgICAgLy8gMi4gUmVzdWx0IGZhbGxzIHdpdGhpbiBzcGVs bGluZ1JhbmdlLgpAQCAtMjg5MSwxMSArMjkwMywxMCBAQCB2b2lkIEVkaXRvcjo6bWFya0FuZFJl cGxhY2VGb3IoY29uc3QgU3BlbGxDaGVja1JlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFZlY3RvcjxU ZQogICAgICAgICAgICAgICAgIGlmIChwYXJhZ3JhcGguY2hlY2tpbmdSYW5nZUNvdmVycyh7IHJl c3VsdExvY2F0aW9uICsgZGV0YWlsLnJhbmdlLmxvY2F0aW9uLCBkZXRhaWwucmFuZ2UubGVuZ3Ro IH0pKSB7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gYmFkR3JhbW1hclJhbmdlID0gcGFyYWdy YXBoLnN1YnJhbmdlKHsgcmVzdWx0TG9jYXRpb24gKyBkZXRhaWwucmFuZ2UubG9jYXRpb24sIGRl dGFpbC5yYW5nZS5sZW5ndGggfSk7CiAgICAgICAgICAgICAgICAgICAgIGFkZE1hcmtlcihiYWRH cmFtbWFyUmFuZ2UsIERvY3VtZW50TWFya2VyOjpHcmFtbWFyLCBkZXRhaWwudXNlckRlc2NyaXB0 aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNHcmFtbWFyUmFuZ2VzLmFwcGVuZChD aGFyYWN0ZXJSYW5nZShyZXN1bHRMb2NhdGlvbiArIGRldGFpbC5yYW5nZS5sb2NhdGlvbiwgZGV0 YWlsLnJhbmdlLmxlbmd0aCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAg ICAgICAgfSBlbHNlIGlmIChhdXRvbWF0aWNSZXBsYWNlbWVudFN0YXJ0TG9jYXRpb24gPD0gcmVz dWx0RW5kTG9jYXRpb24gJiYgcmVzdWx0RW5kTG9jYXRpb24gPD0gYXV0b21hdGljUmVwbGFjZW1l bnRFbmRMb2NhdGlvbgotICAgICAgICAgICAgJiYgaXNBdXRvbWF0aWNUZXh0UmVwbGFjZW1lbnRU eXBlKHJlc3VsdFR5cGUpKSB7Ci0gICAgICAgICAgICAvLyBJbiB0aGlzIGNhc2UgdGhlIHJlc3Vs dCByYW5nZSBqdXN0IGhhcyB0byB0b3VjaCB0aGUgYXV0b21hdGljIHJlcGxhY2VtZW50IHJhbmdl LCBzbyB3ZSBjYW4gaGFuZGxlIHJlcGxhY2luZyBub24td29yZCB0ZXh0IHN1Y2ggYXMgcHVuY3R1 YXRpb24uCisgICAgICAgIH0gZWxzZSBpZiAocmVzdWx0UmFuZ2VJc0FjY2VwdGFibGVGb3JSZXBs YWNlbWVudCAmJiBpc0F1dG9tYXRpY1RleHRSZXBsYWNlbWVudFR5cGUocmVzdWx0VHlwZSkpIHsK ICAgICAgICAgICAgIEFTU0VSVChyZXN1bHRMZW5ndGggPiAwKTsKIAogICAgICAgICAgICAgaWYg KHNob3VsZFNob3dDb3JyZWN0aW9uUGFuZWwgJiYgKHJlc3VsdEVuZExvY2F0aW9uIDwgYXV0b21h dGljUmVwbGFjZW1lbnRFbmRMb2NhdGlvbgpAQCAtMzkyNCw2ICszOTM1LDggQEAgT3B0aW9uU2V0 PFRleHRDaGVja2luZ1R5cGU+IEVkaXRvcjo6cmVzb2x2ZVRleHRDaGVja2luZ1R5cGVNYXNrKGNv bnN0IE5vZGUmIHJvb3QKICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBib29sIHNob3Vs ZFNob3dDb3JyZWN0aW9uUGFuZWwgPSB0ZXh0Q2hlY2tpbmdPcHRpb25zLmNvbnRhaW5zKFRleHRD aGVja2luZ1R5cGU6OlNob3dDb3JyZWN0aW9uUGFuZWwpOwogICAgIGJvb2wgc2hvdWxkQ2hlY2tG b3JDb3JyZWN0aW9uID0gc2hvdWxkU2hvd0NvcnJlY3Rpb25QYW5lbCB8fCB0ZXh0Q2hlY2tpbmdP cHRpb25zLmNvbnRhaW5zKFRleHRDaGVja2luZ1R5cGU6OkNvcnJlY3Rpb24pOworI2Vsc2UKKyAg ICBib29sIHNob3VsZENoZWNrRm9yQ29ycmVjdGlvbiA9IHRleHRDaGVja2luZ09wdGlvbnMuY29u dGFpbnMoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbik7CiAjZW5kaWYKIAogICAgIE9wdGlv blNldDxUZXh0Q2hlY2tpbmdUeXBlPiBjaGVja2luZ1R5cGVzOwpAQCAtMzkzMSw5ICszOTQ0LDkg QEAgT3B0aW9uU2V0PFRleHRDaGVja2luZ1R5cGU+IEVkaXRvcjo6cmVzb2x2ZVRleHRDaGVja2lu Z1R5cGVNYXNrKGNvbnN0IE5vZGUmIHJvb3QKICAgICAgICAgY2hlY2tpbmdUeXBlcy5hZGQoVGV4 dENoZWNraW5nVHlwZTo6U3BlbGxpbmcpOwogICAgIGlmIChzaG91bGRNYXJrR3JhbW1hcikKICAg ICAgICAgY2hlY2tpbmdUeXBlcy5hZGQoVGV4dENoZWNraW5nVHlwZTo6R3JhbW1hcik7Ci0jaWYg IVBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYgKHNob3VsZENoZWNrRm9yQ29ycmVjdGlvbikK ICAgICAgICAgY2hlY2tpbmdUeXBlcy5hZGQoVGV4dENoZWNraW5nVHlwZTo6Q29ycmVjdGlvbik7 CisjaWYgIVBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYgKHNob3VsZFNob3dDb3JyZWN0aW9u UGFuZWwpCiAgICAgICAgIGNoZWNraW5nVHlwZXMuYWRkKFRleHRDaGVja2luZ1R5cGU6OlNob3dD b3JyZWN0aW9uUGFuZWwpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvVGV4dENoZWNrZXJJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvVGV4dENo ZWNrZXJJT1MubW0KaW5kZXggMDFhMTY3YTc4ZTM3Y2QzY2RmNGIxNmNlZWI5ODViZmE1YjU1YzY2 Yy4uMTExNWE2NTY0ZWIzYzVhMzkyMGVkODEwOGM1ZWFkN2VhZDVhZGI5MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1RleHRDaGVja2VySU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9UZXh0Q2hlY2tlcklPUy5tbQpAQCAtMjI4LDYgKzIyOCw4 IEBAIFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IFRleHRDaGVja2VyOjpjaGVja1RleHRPZlBh cmFncmFwaChTcGVsbERvY3VtZW50VGFnIHNwCiAgICAgICAgICAgICB0eXBlcyB8PSBOU1RleHRD aGVja2luZ1R5cGVTcGVsbGluZzsKICAgICAgICAgaWYgKGNoZWNraW5nVHlwZXMuY29udGFpbnMo VGV4dENoZWNraW5nVHlwZTo6R3JhbW1hcikpCiAgICAgICAgICAgICB0eXBlcyB8PSBOU1RleHRD aGVja2luZ1R5cGVHcmFtbWFyOworICAgICAgICBpZiAoY2hlY2tpbmdUeXBlcy5jb250YWlucyhU ZXh0Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uKSkKKyAgICAgICAgICAgIHR5cGVzIHw9IE5TVGV4 dENoZWNraW5nVHlwZUNvcnJlY3Rpb247CiAgICAgICAgIE5TRGljdGlvbmFyeSAqb3B0aW9ucyA9 IEB7CiAgICAgICAgICAgICBAIkluc2VydGlvblBvaW50IiA6IEAoaW5zZXJ0aW9uUG9pbnQpCiAg ICAgICAgIH07CkBAIC0yNjUsNiArMjY3LDEyIEBAIFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+ IFRleHRDaGVja2VyOjpjaGVja1RleHRPZlBhcmFncmFwaChTcGVsbERvY3VtZW50VGFnIHNwCiAg ICAgICAgICAgICAgICAgICAgIHJlc3VsdC5kZXRhaWxzLnVuY2hlY2tlZEFwcGVuZChXVEZNb3Zl KGRldGFpbCkpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXN1bHRzLmFw cGVuZChXVEZNb3ZlKHJlc3VsdCkpOworICAgICAgICAgICAgfSBlbHNlIGlmIChyZXN1bHRUeXBl ID09IE5TVGV4dENoZWNraW5nVHlwZUNvcnJlY3Rpb24gJiYgY2hlY2tpbmdUeXBlcy5jb250YWlu cyhUZXh0Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uKSkgeworICAgICAgICAgICAgICAgIFRleHRD aGVja2luZ1Jlc3VsdCByZXN1bHQ7CisgICAgICAgICAgICAgICAgcmVzdWx0LnR5cGUgPSBUZXh0 Q2hlY2tpbmdUeXBlOjpDb3JyZWN0aW9uOworICAgICAgICAgICAgICAgIHJlc3VsdC5yYW5nZSA9 IHJlc3VsdFJhbmdlOworICAgICAgICAgICAgICAgIHJlc3VsdC5yZXBsYWNlbWVudCA9IFtpbmNv bWluZ1Jlc3VsdCByZXBsYWNlbWVudFN0cmluZ107CisgICAgICAgICAgICAgICAgcmVzdWx0cy5h cHBlbmQoV1RGTW92ZShyZXN1bHQpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0g ZWxzZQo=