246580 2022-10-15 13:29:45 -0700 AX: WebKit does not break AX modality when focus is explicitly moved outside the modal 2022-10-17 21:48:22 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1905895 0 tyler_w 2022-10-15 13:29:45 -0700 https://www.w3.org/TR/wai-aria-1.1/#aria-modal "If focus moves to an element outside the modal element, assistive technologies SHOULD NOT limit navigation to the modal element." We don't follow this recommendation, and we should. 1905896 1 webkit-bug-importer 2022-10-15 13:29:55 -0700 <rdar://problem/101209793> 1905897 2 463012 tyler_w 2022-10-15 13:33:58 -0700 Created attachment 463012 Patch 1905898 3 463013 tyler_w 2022-10-15 13:34:46 -0700 Created attachment 463013 Patch 1906032 4 463013 cfleizach 2022-10-16 21:56:17 -0700 Comment on attachment 463013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=463013&action=review > Source/WebCore/accessibility/AXObjectCache.h:515 > + enum class WillRecomputeFocus : bool { No, Yes }; "RecomputeFocus" seems like might be enough > Source/WebCore/accessibility/AXObjectCache.h:517 > + Element* updateCurrentModalNodeInternal(WillRecomputeFocus = WillRecomputeFocus::No); both of these are private methods. can they be combined? or renamed to be more specific? 1906223 5 463039 tyler_w 2022-10-17 12:23:28 -0700 Created attachment 463039 Patch 1906224 6 tyler_w 2022-10-17 12:24:11 -0700 (In reply to chris fleizach from comment #4) > Comment on attachment 463013 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=463013&action=review > > > Source/WebCore/accessibility/AXObjectCache.h:515 > > + enum class WillRecomputeFocus : bool { No, Yes }; > > "RecomputeFocus" seems like might be enough I chose "WillRecomputeFocus" here because updateCurrentModalNodeInternal needs to know if the calling code knows we will recompute the focus through some other means (e.g. via our modal auto-focusing mechanism). It needs to know this because if the calling context will not recompute focus, and the focused element is outside our modals, we must invalidate modality per-spec. I feel like "RecomputeFocus" doesn't capture this intent the same way "WillRecomputeFocus" does, but if you feel strongly about RecomputeFocus or some other alternative I'd be willing to make the change. > > Source/WebCore/accessibility/AXObjectCache.h:517 > > + Element* updateCurrentModalNodeInternal(WillRecomputeFocus = WillRecomputeFocus::No); > > both of these are private methods. can they be combined? or renamed to be > more specific? Fixed by inlining updateCurrentModalNodeInternal into a lambda within updateCurrentModalNode. 1906379 7 ews-feeder 2022-10-17 21:48:20 -0700 Committed 255665@main (b6eab27a3f8d): <https://commits.webkit.org/255665@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463039. 463012 2022-10-15 13:33:58 -0700 2022-10-15 13:34:45 -0700 Patch bug-246580-20221015133357.patch text/plain 6777 tyler_w RnJvbSAxYzQzNjBhYTNkMDIwODAzMWQxZmI0ZDZlODRjNWI0ZTcxMDMzZGMyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCAxNSBPY3QgMjAyMiAxMzozMDo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBX ZWJLaXQgZG9lcyBub3QgYnJlYWsgQVggbW9kYWxpdHkgd2hlbiBmb2N1cyBpcwogZXhwbGljaXRs eSBtb3ZlZCBvdXRzaWRlIHRoZSBtb2RhbAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI0NjU4MCByZGFyOi8vcHJvYmxlbS8xMDEyMDk3OTMKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKaHR0cHM6Ly93d3cudzMub3JnL1RSL3dhaS1hcmlhLTEuMS8jYXJpYS1t b2RhbAoKIklmIGZvY3VzIG1vdmVzIHRvIGFuIGVsZW1lbnQgb3V0c2lkZSB0aGUgbW9kYWwgZWxl bWVudCwgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyBTSE9VTEQgTk9UIGxpbWl0IG5hdmlnYXRpb24g dG8gdGhlIG1vZGFsIGVsZW1lbnQuIgoKV2l0aCB0aGlzIHBhdGNoLCB3ZSBub3cgZm9sbG93IHRo aXMgcmVjb21tZW5kYXRpb24uCgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2Rh bC1tdWx0aXBsZS1kaWFsb2dzLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9ncy5odG1sOgoqIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9EZXJpdmVkU291cmNlcy1pbnB1dC54Y2ZpbGVsaXN0OgoqIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjp1 cGRhdGVDdXJyZW50TW9kYWxOb2RlKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1 cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCk6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwZXJmb3Jt RGVmZXJyZWRDYWNoZVVwZGF0ZSk6CiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcCB8IDE4ICsrKysrKysrKysrKystLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmggICB8ICA1ICsrKy0tCiAuLi4vYXJpYS1tb2RhbC1tdWx0aXBs ZS1kaWFsb2dzLWV4cGVjdGVkLnR4dCAgIHwgIDQgKysrKwogLi4uL2FyaWEtbW9kYWwtbXVsdGlw bGUtZGlhbG9ncy5odG1sICAgICAgICAgICB8ICA2ICsrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAy NiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGRjMWE4NGE5N2VjZC4uYTQ0YTE5ODZl MTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKQEAgLTMwOSwxMCArMzA5LDEwIEBAIGJvb2wgQVhPYmplY3RDYWNoZTo6bW9kYWxFbGVtZW50 SGFzQWNjZXNzaWJsZUNvbnRlbnQoRWxlbWVudCYgZWxlbWVudCkKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKLXZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZSgpCit2b2lk IEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoV2lsbFJlY29tcHV0ZUZvY3Vz IHdpbGxSZWNvbXB1dGVGb2N1cykKIHsKICAgICBhdXRvKiBwcmV2aW91c01vZGFsID0gbV9jdXJy ZW50TW9kYWxFbGVtZW50LmdldCgpOwotICAgIG1fY3VycmVudE1vZGFsRWxlbWVudCA9IHVwZGF0 ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCgpOworICAgIG1fY3VycmVudE1vZGFsRWxlbWVudCA9 IHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCh3aWxsUmVjb21wdXRlRm9jdXMpOwogICAg IGlmIChwcmV2aW91c01vZGFsICE9IG1fY3VycmVudE1vZGFsRWxlbWVudC5nZXQoKSkgewogICAg ICAgICBjaGlsZHJlbkNoYW5nZWQocm9vdFdlYkFyZWEoKSk7CiAjaWYgRU5BQkxFKEFDQ0VTU0lC SUxJVFlfSVNPTEFURURfVFJFRSkKQEAgLTMyMyw3ICszMjMsNyBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKQogICAgIH0KIH0KIAotRWxlbWVudCogQVhPYmpl Y3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZUludGVybmFsKCkKK0VsZW1lbnQqIEFYT2Jq ZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbChXaWxsUmVjb21wdXRlRm9j dXMgd2lsbFJlY29tcHV0ZUZvY3VzKQogewogICAgIC8vIFRoZXJlIG1pZ2h0IGJlIG11bHRpcGxl IG1vZGFsIGRpYWxvZyBub2Rlcy4KICAgICAvLyBXZSB1c2UgdGhpcyBmdW5jdGlvbiB0byBwaWNr IHRoZSBvbmUgd2Ugd2FudC4KQEAgLTM0MCw2ICszNDAsNyBAQCBFbGVtZW50KiBBWE9iamVjdENh Y2hlOjp1cGRhdGVDdXJyZW50TW9kYWxOb2RlSW50ZXJuYWwoKQogICAgIC8vIElmIGFueSBvZiB0 aGUgbW9kYWwgbm9kZXMgY29udGFpbnMgdGhlIGtleWJvYXJkIGZvY3VzLCB3ZSB3YW50IHRvIHBp Y2sgdGhhdCBvbmUuCiAgICAgLy8gSWYgbm90LCB3ZSB3YW50IHRvIHBpY2sgdGhlIGxhc3Qgdmlz aWJsZSBkaWFsb2cgaW4gdGhlIERPTS4KICAgICBSZWZQdHI8RWxlbWVudD4gZm9jdXNlZEVsZW1l bnQgPSBkb2N1bWVudCgpLmZvY3VzZWRFbGVtZW50KCk7CisgICAgYm9vbCBmb2N1c2VkRWxlbWVu dElzT3V0c2lkZU1vZGFscyA9IGZvY3VzZWRFbGVtZW50OwogICAgIFJlZlB0cjxFbGVtZW50PiBs YXN0VmlzaWJsZTsKICAgICBmb3IgKGF1dG8mIGVsZW1lbnQgOiBtX21vZGFsRWxlbWVudHMpIHsK ICAgICAgICAgLy8gRWxlbWVudHMgaW4gbV9tb2RhbEVsZW1lbnRzU2V0IG1heSBoYXZlIGJlY29t ZSB1bi1tb2RhbCBzaW5jZSB3ZSBhZGRlZCB0aGVtLCBidXQgbm90IHlldCByZW1vdmVkCkBAIC0z NTIsOSArMzUzLDE2IEBAIEVsZW1lbnQqIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2Rh bE5vZGVJbnRlcm5hbCgpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBsYXN0Vmlz aWJsZSA9IGVsZW1lbnQuZ2V0KCk7Ci0gICAgICAgIGlmIChmb2N1c2VkRWxlbWVudCAmJiBmb2N1 c2VkRWxlbWVudC0+aXNEZXNjZW5kYW50T2YoKmVsZW1lbnQpKQorICAgICAgICBpZiAoZm9jdXNl ZEVsZW1lbnQgJiYgZm9jdXNlZEVsZW1lbnQtPmlzRGVzY2VuZGFudE9mKCplbGVtZW50KSkgewor ICAgICAgICAgICAgZm9jdXNlZEVsZW1lbnRJc091dHNpZGVNb2RhbHMgPSBmYWxzZTsKICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgfQorCisgICAgLy8gSWYgdGhlcmUgaXMgYSBm b2N1c2VkIGVsZW1lbnQsIGFuZCBpdCdzIG5vdCBpbnNpZGUgYW55IG9mIHRoZSBtb2RhbHMsIHdl IHNob3VsZAorICAgIC8vIGNvbnNpZGVyIGFsbCBtb2RhbHMgaW5hY3RpdmUgdG8gYWxsb3cgdGhl IHVzZXIgdG8gZnJlZWx5IG5hdmlnYXRlLgorICAgIGlmIChmb2N1c2VkRWxlbWVudElzT3V0c2lk ZU1vZGFscyAmJiB3aWxsUmVjb21wdXRlRm9jdXMgPT0gV2lsbFJlY29tcHV0ZUZvY3VzOjpObykK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIGxhc3RWaXNpYmxlLmdldCgpOwog fQogCkBAIC0zNTcxLDcgKzM1NzksNyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1EZWZl cnJlZENhY2hlVXBkYXRlKCkKICAgICBtX2RlZmVycmVkTW9kYWxDaGFuZ2VkTGlzdC5jbGVhcigp OwogCiAgICAgaWYgKHNob3VsZFJlY29tcHV0ZU1vZGFsKSB7Ci0gICAgICAgIHVwZGF0ZUN1cnJl bnRNb2RhbE5vZGUoKTsKKyAgICAgICAgdXBkYXRlQ3VycmVudE1vZGFsTm9kZSh1cGRhdGVkRm9j dXNlZEVsZW1lbnQgPyBXaWxsUmVjb21wdXRlRm9jdXM6Ok5vIDogV2lsbFJlY29tcHV0ZUZvY3Vz OjpZZXMpOwogICAgICAgICAvLyAiV2hlbiBhIG1vZGFsIGVsZW1lbnQgaXMgZGlzcGxheWVkLCBh c3Npc3RpdmUgdGVjaG5vbG9naWVzIFNIT1VMRCBuYXZpZ2F0ZSB0byB0aGUgZWxlbWVudCB1bmxl c3MgZm9jdXMgaGFzIGV4cGxpY2l0bHkgYmVlbiBzZXQgZWxzZXdoZXJlLiIKICAgICAgICAgLy8g YHVwZGF0ZWRGb2N1c2VkRWxlbWVudGAgaW5kaWNhdGVzIGZvY3VzIHdhcyBleHBsaWNpdGx5IHNl dCBlbHNld2hlcmUsIHNvIGRvbid0IGF1dG9mb2N1cyBpbnRvIHRoZSBtb2RhbC4KICAgICAgICAg Ly8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL2FyaWEvI2FyaWEtbW9kYWwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXggODA3NTliNGZhM2I4Li4wZmZi ZTkxNzdhMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5oCkBAIC01MTIsOCArNTEyLDkgQEAgcHJpdmF0ZToKICAgICAvLyBhcmlhLW1vZGFsIG9yIG1v ZGFsIDxkaWFsb2c+IHJlbGF0ZWQKICAgICBib29sIGlzTW9kYWxFbGVtZW50KEVsZW1lbnQmKSBj b25zdDsKICAgICB2b2lkIGZpbmRNb2RhbE5vZGVzKCk7Ci0gICAgdm9pZCB1cGRhdGVDdXJyZW50 TW9kYWxOb2RlKCk7Ci0gICAgRWxlbWVudCogdXBkYXRlQ3VycmVudE1vZGFsTm9kZUludGVybmFs KCk7CisgICAgZW51bSBjbGFzcyBXaWxsUmVjb21wdXRlRm9jdXMgOiBib29sIHsgTm8sIFllcyB9 OworICAgIHZvaWQgdXBkYXRlQ3VycmVudE1vZGFsTm9kZShXaWxsUmVjb21wdXRlRm9jdXMgPSBX aWxsUmVjb21wdXRlRm9jdXM6Ok5vKTsKKyAgICBFbGVtZW50KiB1cGRhdGVDdXJyZW50TW9kYWxO b2RlSW50ZXJuYWwoV2lsbFJlY29tcHV0ZUZvY3VzID0gV2lsbFJlY29tcHV0ZUZvY3VzOjpObyk7 CiAgICAgYm9vbCBpc05vZGVWaXNpYmxlKE5vZGUqKSBjb25zdDsKICAgICBib29sIG1vZGFsRWxl bWVudEhhc0FjY2Vzc2libGVDb250ZW50KEVsZW1lbnQmKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxv Z3MtZXhwZWN0ZWQudHh0CmluZGV4IGFmYWU5NmM0ZDdmZS4uMmRkMDZhMzY1YTE5IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9n cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFs LW11bHRpcGxlLWRpYWxvZ3MtZXhwZWN0ZWQudHh0CkBAIC0yMiw2ICsyMiwxMCBAQCBQQVNTOiBi YWNrZ3JvdW5kIGFjY2Vzc2libGU6IGZhbHNlCiBQQVNTOiAjZGlhbG9nMSBhY2Nlc3NpYmxlOiB0 cnVlCiBQQVNTOiAjZGlhbG9nMiBhY2Nlc3NpYmxlOiBmYWxzZQogCitGb2N1c2luZyBvbiBiYWNr Z3JvdW5kLgorCitQQVNTOiBiYWNrZ3JvdW5kIGFjY2Vzc2libGU6IHRydWUKKwogTW92aW5nIGZv Y3VzIGJhY2sgdG8gZmlyc3QgZGVzY2VuZGFudCBvZiAjZGlhbG9nMi4KIAogUEFTUzogYmFja2dy b3VuZCBhY2Nlc3NpYmxlOiBmYWxzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwKaW5kZXggMzQ5OTI5N2Zh MTZiLi44MzZiMzEwZjkwNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv YXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MuaHRtbApAQCAtNTEsNiArNTEsMTIg QEAKICAgICAgICAgICAgIGF3YWl0IGRpYWxvZzFBY2Nlc3NpYmxlKHRydWUpOwogICAgICAgICAg ICAgYXdhaXQgZGlhbG9nMkFjY2Vzc2libGUoZmFsc2UpOwogCisgICAgICAgICAgICAvLyBodHRw czovL3d3dy53My5vcmcvVFIvd2FpLWFyaWEtMS4xLyNhcmlhLW1vZGFsCisgICAgICAgICAgICAv LyAiSWYgZm9jdXMgbW92ZXMgdG8gYW4gZWxlbWVudCBvdXRzaWRlIHRoZSBtb2RhbCBlbGVtZW50 LCBhc3Npc3RpdmUgdGVjaG5vbG9naWVzIFNIT1VMRCBOT1QgbGltaXQgbmF2aWdhdGlvbiB0byB0 aGUgbW9kYWwgZWxlbWVudC4iCisgICAgICAgICAgICB0ZXN0T3V0cHV0ICs9ICJcbkZvY3VzaW5n IG9uIGJhY2tncm91bmQuXG5cbiI7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgidGV4dGZpZWxkIikuZm9jdXMoKTsKKyAgICAgICAgICAgIGF3YWl0IGJhY2tncm91bmRBY2Nl c3NpYmxlKHRydWUpOworCiAgICAgICAgICAgICB0ZXN0T3V0cHV0ICs9ICJcbk1vdmluZyBmb2N1 cyBiYWNrIHRvIGZpcnN0IGRlc2NlbmRhbnQgb2YgI2RpYWxvZzIuXG5cbiI7CiAgICAgICAgICAg ICBmb2N1c0ZpcnN0RGVzY2VuZGFudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGlhbG9nMiIp KTsKICAgICAgICAgICAgIGF3YWl0IGJhY2tncm91bmRBY2Nlc3NpYmxlKGZhbHNlKTsK 463013 2022-10-15 13:34:46 -0700 2022-10-17 12:23:26 -0700 Patch bug-246580-20221015133445.patch text/plain 6720 tyler_w RnJvbSAwZDE1Y2U0YjRlZDlkNDhkZjBmZjkwOWIzNmY0YzIyY2MzNzcyYWNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCAxNSBPY3QgMjAyMiAxMzozMDo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBX ZWJLaXQgZG9lcyBub3QgYnJlYWsgQVggbW9kYWxpdHkgd2hlbiBmb2N1cyBpcwogZXhwbGljaXRs eSBtb3ZlZCBvdXRzaWRlIHRoZSBtb2RhbAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI0NjU4MCByZGFyOi8vcHJvYmxlbS8xMDEyMDk3OTMKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKaHR0cHM6Ly93d3cudzMub3JnL1RSL3dhaS1hcmlhLTEuMS8jYXJpYS1t b2RhbAoKIklmIGZvY3VzIG1vdmVzIHRvIGFuIGVsZW1lbnQgb3V0c2lkZSB0aGUgbW9kYWwgZWxl bWVudCwgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyBTSE9VTEQgTk9UIGxpbWl0IG5hdmlnYXRpb24g dG8gdGhlIG1vZGFsIGVsZW1lbnQuIgoKV2l0aCB0aGlzIHBhdGNoLCB3ZSBub3cgZm9sbG93IHRo aXMgcmVjb21tZW5kYXRpb24uCgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2Rh bC1tdWx0aXBsZS1kaWFsb2dzLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9ncy5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjp1 cGRhdGVDdXJyZW50TW9kYWxOb2RlKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1 cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCk6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwZXJmb3Jt RGVmZXJyZWRDYWNoZVVwZGF0ZSk6CiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmg6Ci0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcCB8IDE4ICsrKysrKysrKysrKystLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmggICB8ICA1ICsrKy0tCiAuLi4vYXJpYS1tb2RhbC1tdWx0aXBs ZS1kaWFsb2dzLWV4cGVjdGVkLnR4dCAgIHwgIDQgKysrKwogLi4uL2FyaWEtbW9kYWwtbXVsdGlw bGUtZGlhbG9ncy5odG1sICAgICAgICAgICB8ICA2ICsrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAy NiBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGRjMWE4NGE5N2VjZC4uYTQ0YTE5ODZl MTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKQEAgLTMwOSwxMCArMzA5LDEwIEBAIGJvb2wgQVhPYmplY3RDYWNoZTo6bW9kYWxFbGVtZW50 SGFzQWNjZXNzaWJsZUNvbnRlbnQoRWxlbWVudCYgZWxlbWVudCkKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKLXZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZSgpCit2b2lk IEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoV2lsbFJlY29tcHV0ZUZvY3Vz IHdpbGxSZWNvbXB1dGVGb2N1cykKIHsKICAgICBhdXRvKiBwcmV2aW91c01vZGFsID0gbV9jdXJy ZW50TW9kYWxFbGVtZW50LmdldCgpOwotICAgIG1fY3VycmVudE1vZGFsRWxlbWVudCA9IHVwZGF0 ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCgpOworICAgIG1fY3VycmVudE1vZGFsRWxlbWVudCA9 IHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCh3aWxsUmVjb21wdXRlRm9jdXMpOwogICAg IGlmIChwcmV2aW91c01vZGFsICE9IG1fY3VycmVudE1vZGFsRWxlbWVudC5nZXQoKSkgewogICAg ICAgICBjaGlsZHJlbkNoYW5nZWQocm9vdFdlYkFyZWEoKSk7CiAjaWYgRU5BQkxFKEFDQ0VTU0lC SUxJVFlfSVNPTEFURURfVFJFRSkKQEAgLTMyMyw3ICszMjMsNyBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKQogICAgIH0KIH0KIAotRWxlbWVudCogQVhPYmpl Y3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZUludGVybmFsKCkKK0VsZW1lbnQqIEFYT2Jq ZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGVJbnRlcm5hbChXaWxsUmVjb21wdXRlRm9j dXMgd2lsbFJlY29tcHV0ZUZvY3VzKQogewogICAgIC8vIFRoZXJlIG1pZ2h0IGJlIG11bHRpcGxl IG1vZGFsIGRpYWxvZyBub2Rlcy4KICAgICAvLyBXZSB1c2UgdGhpcyBmdW5jdGlvbiB0byBwaWNr IHRoZSBvbmUgd2Ugd2FudC4KQEAgLTM0MCw2ICszNDAsNyBAQCBFbGVtZW50KiBBWE9iamVjdENh Y2hlOjp1cGRhdGVDdXJyZW50TW9kYWxOb2RlSW50ZXJuYWwoKQogICAgIC8vIElmIGFueSBvZiB0 aGUgbW9kYWwgbm9kZXMgY29udGFpbnMgdGhlIGtleWJvYXJkIGZvY3VzLCB3ZSB3YW50IHRvIHBp Y2sgdGhhdCBvbmUuCiAgICAgLy8gSWYgbm90LCB3ZSB3YW50IHRvIHBpY2sgdGhlIGxhc3Qgdmlz aWJsZSBkaWFsb2cgaW4gdGhlIERPTS4KICAgICBSZWZQdHI8RWxlbWVudD4gZm9jdXNlZEVsZW1l bnQgPSBkb2N1bWVudCgpLmZvY3VzZWRFbGVtZW50KCk7CisgICAgYm9vbCBmb2N1c2VkRWxlbWVu dElzT3V0c2lkZU1vZGFscyA9IGZvY3VzZWRFbGVtZW50OwogICAgIFJlZlB0cjxFbGVtZW50PiBs YXN0VmlzaWJsZTsKICAgICBmb3IgKGF1dG8mIGVsZW1lbnQgOiBtX21vZGFsRWxlbWVudHMpIHsK ICAgICAgICAgLy8gRWxlbWVudHMgaW4gbV9tb2RhbEVsZW1lbnRzU2V0IG1heSBoYXZlIGJlY29t ZSB1bi1tb2RhbCBzaW5jZSB3ZSBhZGRlZCB0aGVtLCBidXQgbm90IHlldCByZW1vdmVkCkBAIC0z NTIsOSArMzUzLDE2IEBAIEVsZW1lbnQqIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2Rh bE5vZGVJbnRlcm5hbCgpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBsYXN0Vmlz aWJsZSA9IGVsZW1lbnQuZ2V0KCk7Ci0gICAgICAgIGlmIChmb2N1c2VkRWxlbWVudCAmJiBmb2N1 c2VkRWxlbWVudC0+aXNEZXNjZW5kYW50T2YoKmVsZW1lbnQpKQorICAgICAgICBpZiAoZm9jdXNl ZEVsZW1lbnQgJiYgZm9jdXNlZEVsZW1lbnQtPmlzRGVzY2VuZGFudE9mKCplbGVtZW50KSkgewor ICAgICAgICAgICAgZm9jdXNlZEVsZW1lbnRJc091dHNpZGVNb2RhbHMgPSBmYWxzZTsKICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgfQorCisgICAgLy8gSWYgdGhlcmUgaXMgYSBm b2N1c2VkIGVsZW1lbnQsIGFuZCBpdCdzIG5vdCBpbnNpZGUgYW55IG9mIHRoZSBtb2RhbHMsIHdl IHNob3VsZAorICAgIC8vIGNvbnNpZGVyIGFsbCBtb2RhbHMgaW5hY3RpdmUgdG8gYWxsb3cgdGhl IHVzZXIgdG8gZnJlZWx5IG5hdmlnYXRlLgorICAgIGlmIChmb2N1c2VkRWxlbWVudElzT3V0c2lk ZU1vZGFscyAmJiB3aWxsUmVjb21wdXRlRm9jdXMgPT0gV2lsbFJlY29tcHV0ZUZvY3VzOjpObykK KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIGxhc3RWaXNpYmxlLmdldCgpOwog fQogCkBAIC0zNTcxLDcgKzM1NzksNyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1EZWZl cnJlZENhY2hlVXBkYXRlKCkKICAgICBtX2RlZmVycmVkTW9kYWxDaGFuZ2VkTGlzdC5jbGVhcigp OwogCiAgICAgaWYgKHNob3VsZFJlY29tcHV0ZU1vZGFsKSB7Ci0gICAgICAgIHVwZGF0ZUN1cnJl bnRNb2RhbE5vZGUoKTsKKyAgICAgICAgdXBkYXRlQ3VycmVudE1vZGFsTm9kZSh1cGRhdGVkRm9j dXNlZEVsZW1lbnQgPyBXaWxsUmVjb21wdXRlRm9jdXM6Ok5vIDogV2lsbFJlY29tcHV0ZUZvY3Vz OjpZZXMpOwogICAgICAgICAvLyAiV2hlbiBhIG1vZGFsIGVsZW1lbnQgaXMgZGlzcGxheWVkLCBh c3Npc3RpdmUgdGVjaG5vbG9naWVzIFNIT1VMRCBuYXZpZ2F0ZSB0byB0aGUgZWxlbWVudCB1bmxl c3MgZm9jdXMgaGFzIGV4cGxpY2l0bHkgYmVlbiBzZXQgZWxzZXdoZXJlLiIKICAgICAgICAgLy8g YHVwZGF0ZWRGb2N1c2VkRWxlbWVudGAgaW5kaWNhdGVzIGZvY3VzIHdhcyBleHBsaWNpdGx5IHNl dCBlbHNld2hlcmUsIHNvIGRvbid0IGF1dG9mb2N1cyBpbnRvIHRoZSBtb2RhbC4KICAgICAgICAg Ly8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL2FyaWEvI2FyaWEtbW9kYWwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKaW5kZXggODA3NTliNGZhM2I4Li4wZmZi ZTkxNzdhMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5oCkBAIC01MTIsOCArNTEyLDkgQEAgcHJpdmF0ZToKICAgICAvLyBhcmlhLW1vZGFsIG9yIG1v ZGFsIDxkaWFsb2c+IHJlbGF0ZWQKICAgICBib29sIGlzTW9kYWxFbGVtZW50KEVsZW1lbnQmKSBj b25zdDsKICAgICB2b2lkIGZpbmRNb2RhbE5vZGVzKCk7Ci0gICAgdm9pZCB1cGRhdGVDdXJyZW50 TW9kYWxOb2RlKCk7Ci0gICAgRWxlbWVudCogdXBkYXRlQ3VycmVudE1vZGFsTm9kZUludGVybmFs KCk7CisgICAgZW51bSBjbGFzcyBXaWxsUmVjb21wdXRlRm9jdXMgOiBib29sIHsgTm8sIFllcyB9 OworICAgIHZvaWQgdXBkYXRlQ3VycmVudE1vZGFsTm9kZShXaWxsUmVjb21wdXRlRm9jdXMgPSBX aWxsUmVjb21wdXRlRm9jdXM6Ok5vKTsKKyAgICBFbGVtZW50KiB1cGRhdGVDdXJyZW50TW9kYWxO b2RlSW50ZXJuYWwoV2lsbFJlY29tcHV0ZUZvY3VzID0gV2lsbFJlY29tcHV0ZUZvY3VzOjpObyk7 CiAgICAgYm9vbCBpc05vZGVWaXNpYmxlKE5vZGUqKSBjb25zdDsKICAgICBib29sIG1vZGFsRWxl bWVudEhhc0FjY2Vzc2libGVDb250ZW50KEVsZW1lbnQmKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxv Z3MtZXhwZWN0ZWQudHh0CmluZGV4IGFmYWU5NmM0ZDdmZS4uMmRkMDZhMzY1YTE5IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9n cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFs LW11bHRpcGxlLWRpYWxvZ3MtZXhwZWN0ZWQudHh0CkBAIC0yMiw2ICsyMiwxMCBAQCBQQVNTOiBi YWNrZ3JvdW5kIGFjY2Vzc2libGU6IGZhbHNlCiBQQVNTOiAjZGlhbG9nMSBhY2Nlc3NpYmxlOiB0 cnVlCiBQQVNTOiAjZGlhbG9nMiBhY2Nlc3NpYmxlOiBmYWxzZQogCitGb2N1c2luZyBvbiBiYWNr Z3JvdW5kLgorCitQQVNTOiBiYWNrZ3JvdW5kIGFjY2Vzc2libGU6IHRydWUKKwogTW92aW5nIGZv Y3VzIGJhY2sgdG8gZmlyc3QgZGVzY2VuZGFudCBvZiAjZGlhbG9nMi4KIAogUEFTUzogYmFja2dy b3VuZCBhY2Nlc3NpYmxlOiBmYWxzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwKaW5kZXggMzQ5OTI5N2Zh MTZiLi44MzZiMzEwZjkwNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv YXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MuaHRtbApAQCAtNTEsNiArNTEsMTIg QEAKICAgICAgICAgICAgIGF3YWl0IGRpYWxvZzFBY2Nlc3NpYmxlKHRydWUpOwogICAgICAgICAg ICAgYXdhaXQgZGlhbG9nMkFjY2Vzc2libGUoZmFsc2UpOwogCisgICAgICAgICAgICAvLyBodHRw czovL3d3dy53My5vcmcvVFIvd2FpLWFyaWEtMS4xLyNhcmlhLW1vZGFsCisgICAgICAgICAgICAv LyAiSWYgZm9jdXMgbW92ZXMgdG8gYW4gZWxlbWVudCBvdXRzaWRlIHRoZSBtb2RhbCBlbGVtZW50 LCBhc3Npc3RpdmUgdGVjaG5vbG9naWVzIFNIT1VMRCBOT1QgbGltaXQgbmF2aWdhdGlvbiB0byB0 aGUgbW9kYWwgZWxlbWVudC4iCisgICAgICAgICAgICB0ZXN0T3V0cHV0ICs9ICJcbkZvY3VzaW5n IG9uIGJhY2tncm91bmQuXG5cbiI7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgidGV4dGZpZWxkIikuZm9jdXMoKTsKKyAgICAgICAgICAgIGF3YWl0IGJhY2tncm91bmRBY2Nl c3NpYmxlKHRydWUpOworCiAgICAgICAgICAgICB0ZXN0T3V0cHV0ICs9ICJcbk1vdmluZyBmb2N1 cyBiYWNrIHRvIGZpcnN0IGRlc2NlbmRhbnQgb2YgI2RpYWxvZzIuXG5cbiI7CiAgICAgICAgICAg ICBmb2N1c0ZpcnN0RGVzY2VuZGFudChkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGlhbG9nMiIp KTsKICAgICAgICAgICAgIGF3YWl0IGJhY2tncm91bmRBY2Nlc3NpYmxlKGZhbHNlKTsK 463039 2022-10-17 12:23:28 -0700 2022-10-17 21:48:21 -0700 Patch bug-246580-20221017122327.patch text/plain 8896 tyler_w RnJvbSA4Y2VmYmJhM2RhNTFmOWVlZTdlYjA3YjNmYjc5ODFlNmE2Mzg1NjA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogU2F0LCAxNSBPY3QgMjAyMiAxMzozMDo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBX ZWJLaXQgZG9lcyBub3QgYnJlYWsgQVggbW9kYWxpdHkgd2hlbiBmb2N1cyBpcwogZXhwbGljaXRs eSBtb3ZlZCBvdXRzaWRlIHRoZSBtb2RhbAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI0NjU4MCByZGFyOi8vcHJvYmxlbS8xMDEyMDk3OTMKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKaHR0cHM6Ly93d3cudzMub3JnL1RSL3dhaS1hcmlhLTEuMS8jYXJpYS1t b2RhbAoKIklmIGZvY3VzIG1vdmVzIHRvIGFuIGVsZW1lbnQgb3V0c2lkZSB0aGUgbW9kYWwgZWxl bWVudCwgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyBTSE9VTEQgTk9UIGxpbWl0IG5hdmlnYXRpb24g dG8gdGhlIG1vZGFsIGVsZW1lbnQuIgoKV2l0aCB0aGlzIHBhdGNoLCB3ZSBub3cgZm9sbG93IHRo aXMgcmVjb21tZW5kYXRpb24uCgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2Rh bC1tdWx0aXBsZS1kaWFsb2dzLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9ncy5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjp1 cGRhdGVDdXJyZW50TW9kYWxOb2RlKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1 cnJlbnRNb2RhbE5vZGVJbnRlcm5hbCk6CkRlbGV0ZWQuIEZ1bmN0aW9uIGJvZHkgbW92ZWQgdG8g YSBsYW1iZGEgaW5zaWRlIHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUuCihXZWJDb3JlOjpBWE9iamVj dENhY2hlOjpwZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZSk6CiogU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6Ci0tLQogLi4uL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmNwcCAgIHwgODMgKysrKysrKysrKy0tLS0tLS0tLQogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggIHwgIDQgKy0KIC4uLi9hcmlhLW1v ZGFsLW11bHRpcGxlLWRpYWxvZ3MtZXhwZWN0ZWQudHh0ICB8ICA0ICsKIC4uLi9hcmlhLW1vZGFs LW11bHRpcGxlLWRpYWxvZ3MuaHRtbCAgICAgICAgICB8ICA2ICsrCiA0IGZpbGVzIGNoYW5nZWQs IDU3IGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGRjMWE4NGE5N2VjZC4uODM5NjBi N2M5MWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0 Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKQEAgLTMwOSwxMCArMzA5LDUyIEBAIGJvb2wgQVhPYmplY3RDYWNoZTo6bW9kYWxFbGVt ZW50SGFzQWNjZXNzaWJsZUNvbnRlbnQoRWxlbWVudCYgZWxlbWVudCkKICAgICByZXR1cm4gZmFs c2U7CiB9CiAKLXZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZSgpCit2 b2lkIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoV2lsbFJlY29tcHV0ZUZv Y3VzIHdpbGxSZWNvbXB1dGVGb2N1cykKIHsKKyAgICBhdXRvIHJlY29tcHV0ZU1vZGFsRWxlbWVu dCA9IFsmXSAoKSAtPiBFbGVtZW50KiB7CisgICAgICAgIC8vIFRoZXJlIG1pZ2h0IGJlIG11bHRp cGxlIG1vZGFsIGRpYWxvZyBub2Rlcy4KKyAgICAgICAgLy8gV2UgdXNlIHRoaXMgZnVuY3Rpb24g dG8gcGljayB0aGUgb25lIHdlIHdhbnQuCisgICAgICAgIGlmIChtX21vZGFsRWxlbWVudHMuaXNF bXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAgICAgLy8gUGljayB0 aGUgZG9jdW1lbnQgYWN0aXZlIG1vZGFsIDxkaWFsb2c+IGVsZW1lbnQgaWYgaXQgZXhpc3RzLgor ICAgICAgICBpZiAoRWxlbWVudCogYWN0aXZlTW9kYWxEaWFsb2cgPSBkb2N1bWVudCgpLmFjdGl2 ZU1vZGFsRGlhbG9nKCkpIHsKKyAgICAgICAgICAgIEFTU0VSVChtX21vZGFsRWxlbWVudHMuY29u dGFpbnMoYWN0aXZlTW9kYWxEaWFsb2cpKTsKKyAgICAgICAgICAgIHJldHVybiBhY3RpdmVNb2Rh bERpYWxvZzsKKyAgICAgICAgfQorCisgICAgICAgIFNldEZvclNjb3BlIHJldHJpZXZpbmdDdXJy ZW50TW9kYWxOb2RlKG1faXNSZXRyaWV2aW5nQ3VycmVudE1vZGFsTm9kZSwgdHJ1ZSk7CisgICAg ICAgIC8vIElmIGFueSBvZiB0aGUgbW9kYWwgbm9kZXMgY29udGFpbnMgdGhlIGtleWJvYXJkIGZv Y3VzLCB3ZSB3YW50IHRvIHBpY2sgdGhhdCBvbmUuCisgICAgICAgIC8vIElmIG5vdCwgd2Ugd2Fu dCB0byBwaWNrIHRoZSBsYXN0IHZpc2libGUgZGlhbG9nIGluIHRoZSBET00uCisgICAgICAgIFJl ZlB0cjxFbGVtZW50PiBmb2N1c2VkRWxlbWVudCA9IGRvY3VtZW50KCkuZm9jdXNlZEVsZW1lbnQo KTsKKyAgICAgICAgYm9vbCBmb2N1c2VkRWxlbWVudElzT3V0c2lkZU1vZGFscyA9IGZvY3VzZWRF bGVtZW50OworICAgICAgICBSZWZQdHI8RWxlbWVudD4gbGFzdFZpc2libGU7CisgICAgICAgIGZv ciAoYXV0byYgZWxlbWVudCA6IG1fbW9kYWxFbGVtZW50cykgeworICAgICAgICAgICAgLy8gRWxl bWVudHMgaW4gbV9tb2RhbEVsZW1lbnRzU2V0IG1heSBoYXZlIGJlY29tZSB1bi1tb2RhbCBzaW5j ZSB3ZSBhZGRlZCB0aGVtLCBidXQgbm90IHlldCByZW1vdmVkCisgICAgICAgICAgICAvLyBhcyBw YXJ0IG9mIHRoZSBhc3luY2hyb25vdXMgbV9kZWZlcnJlZE1vZGFsQ2hhbmdlZExpc3QgaGFuZGxp bmcuIFNraXAgdGhlc2UuCisgICAgICAgICAgICBpZiAoIWVsZW1lbnQgfHwgIWlzTW9kYWxFbGVt ZW50KCplbGVtZW50KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAg Ly8gVG8gYXZvaWQgdHJhcHBpbmcgdXNlcnMgaW4gYW4gZW1wdHkgbW9kYWwsIHNraXAgYW55IG5v bi12aXNpYmxlIGVsZW1lbnQsIG9yIGFueSBlbGVtZW50IHdpdGhvdXQgYWNjZXNzaWJsZSBjb250 ZW50LgorICAgICAgICAgICAgaWYgKCFpc05vZGVWaXNpYmxlKGVsZW1lbnQuZ2V0KCkpIHx8ICFt b2RhbEVsZW1lbnRIYXNBY2Nlc3NpYmxlQ29udGVudCgqZWxlbWVudCkpCisgICAgICAgICAgICAg ICAgY29udGludWU7CisKKyAgICAgICAgICAgIGxhc3RWaXNpYmxlID0gZWxlbWVudC5nZXQoKTsK KyAgICAgICAgICAgIGlmIChmb2N1c2VkRWxlbWVudCAmJiBmb2N1c2VkRWxlbWVudC0+aXNEZXNj ZW5kYW50T2YoKmVsZW1lbnQpKSB7CisgICAgICAgICAgICAgICAgZm9jdXNlZEVsZW1lbnRJc091 dHNpZGVNb2RhbHMgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorCisgICAgICAgIC8vIElmIHRoZXJlIGlzIGEgZm9jdXNlZCBlbGVtZW50 LCBhbmQgaXQncyBub3QgaW5zaWRlIGFueSBvZiB0aGUgbW9kYWxzLCB3ZSBzaG91bGQKKyAgICAg ICAgLy8gY29uc2lkZXIgYWxsIG1vZGFscyBpbmFjdGl2ZSB0byBhbGxvdyB0aGUgdXNlciB0byBm cmVlbHkgbmF2aWdhdGUuCisgICAgICAgIGlmIChmb2N1c2VkRWxlbWVudElzT3V0c2lkZU1vZGFs cyAmJiB3aWxsUmVjb21wdXRlRm9jdXMgPT0gV2lsbFJlY29tcHV0ZUZvY3VzOjpObykKKyAgICAg ICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICByZXR1cm4gbGFzdFZpc2libGUuZ2V0KCk7 CisgICAgfTsKKwogICAgIGF1dG8qIHByZXZpb3VzTW9kYWwgPSBtX2N1cnJlbnRNb2RhbEVsZW1l bnQuZ2V0KCk7Ci0gICAgbV9jdXJyZW50TW9kYWxFbGVtZW50ID0gdXBkYXRlQ3VycmVudE1vZGFs Tm9kZUludGVybmFsKCk7CisgICAgbV9jdXJyZW50TW9kYWxFbGVtZW50ID0gcmVjb21wdXRlTW9k YWxFbGVtZW50KCk7CiAgICAgaWYgKHByZXZpb3VzTW9kYWwgIT0gbV9jdXJyZW50TW9kYWxFbGVt ZW50LmdldCgpKSB7CiAgICAgICAgIGNoaWxkcmVuQ2hhbmdlZChyb290V2ViQXJlYSgpKTsKICNp ZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQpAQCAtMzIzLDQxICszNjUsNiBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKQogICAgIH0KIH0K IAotRWxlbWVudCogQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3VycmVudE1vZGFsTm9kZUludGVybmFs KCkKLXsKLSAgICAvLyBUaGVyZSBtaWdodCBiZSBtdWx0aXBsZSBtb2RhbCBkaWFsb2cgbm9kZXMu Ci0gICAgLy8gV2UgdXNlIHRoaXMgZnVuY3Rpb24gdG8gcGljayB0aGUgb25lIHdlIHdhbnQuCi0g ICAgaWYgKG1fbW9kYWxFbGVtZW50cy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBudWxscHRy OwotCi0gICAgLy8gUGljayB0aGUgZG9jdW1lbnQgYWN0aXZlIG1vZGFsIDxkaWFsb2c+IGVsZW1l bnQgaWYgaXQgZXhpc3RzLgotICAgIGlmIChFbGVtZW50KiBhY3RpdmVNb2RhbERpYWxvZyA9IGRv Y3VtZW50KCkuYWN0aXZlTW9kYWxEaWFsb2coKSkgewotICAgICAgICBBU1NFUlQobV9tb2RhbEVs ZW1lbnRzLmNvbnRhaW5zKGFjdGl2ZU1vZGFsRGlhbG9nKSk7Ci0gICAgICAgIHJldHVybiBhY3Rp dmVNb2RhbERpYWxvZzsKLSAgICB9Ci0KLSAgICBTZXRGb3JTY29wZSByZXRyaWV2aW5nQ3VycmVu dE1vZGFsTm9kZShtX2lzUmV0cmlldmluZ0N1cnJlbnRNb2RhbE5vZGUsIHRydWUpOwotICAgIC8v IElmIGFueSBvZiB0aGUgbW9kYWwgbm9kZXMgY29udGFpbnMgdGhlIGtleWJvYXJkIGZvY3VzLCB3 ZSB3YW50IHRvIHBpY2sgdGhhdCBvbmUuCi0gICAgLy8gSWYgbm90LCB3ZSB3YW50IHRvIHBpY2sg dGhlIGxhc3QgdmlzaWJsZSBkaWFsb2cgaW4gdGhlIERPTS4KLSAgICBSZWZQdHI8RWxlbWVudD4g Zm9jdXNlZEVsZW1lbnQgPSBkb2N1bWVudCgpLmZvY3VzZWRFbGVtZW50KCk7Ci0gICAgUmVmUHRy PEVsZW1lbnQ+IGxhc3RWaXNpYmxlOwotICAgIGZvciAoYXV0byYgZWxlbWVudCA6IG1fbW9kYWxF bGVtZW50cykgewotICAgICAgICAvLyBFbGVtZW50cyBpbiBtX21vZGFsRWxlbWVudHNTZXQgbWF5 IGhhdmUgYmVjb21lIHVuLW1vZGFsIHNpbmNlIHdlIGFkZGVkIHRoZW0sIGJ1dCBub3QgeWV0IHJl bW92ZWQKLSAgICAgICAgLy8gYXMgcGFydCBvZiB0aGUgYXN5bmNocm9ub3VzIG1fZGVmZXJyZWRN b2RhbENoYW5nZWRMaXN0IGhhbmRsaW5nLiBTa2lwIHRoZXNlLgotICAgICAgICBpZiAoIWVsZW1l bnQgfHwgIWlzTW9kYWxFbGVtZW50KCplbGVtZW50KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwot Ci0gICAgICAgIC8vIFRvIGF2b2lkIHRyYXBwaW5nIHVzZXJzIGluIGFuIGVtcHR5IG1vZGFsLCBz a2lwIGFueSBub24tdmlzaWJsZSBlbGVtZW50LCBvciBhbnkgZWxlbWVudCB3aXRob3V0IGFjY2Vz c2libGUgY29udGVudC4KLSAgICAgICAgaWYgKCFpc05vZGVWaXNpYmxlKGVsZW1lbnQuZ2V0KCkp IHx8ICFtb2RhbEVsZW1lbnRIYXNBY2Nlc3NpYmxlQ29udGVudCgqZWxlbWVudCkpCi0gICAgICAg ICAgICBjb250aW51ZTsKLQotICAgICAgICBsYXN0VmlzaWJsZSA9IGVsZW1lbnQuZ2V0KCk7Ci0g ICAgICAgIGlmIChmb2N1c2VkRWxlbWVudCAmJiBmb2N1c2VkRWxlbWVudC0+aXNEZXNjZW5kYW50 T2YoKmVsZW1lbnQpKQotICAgICAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIHJldHVybiBsYXN0 VmlzaWJsZS5nZXQoKTsKLX0KLQogYm9vbCBBWE9iamVjdENhY2hlOjppc05vZGVWaXNpYmxlKE5v ZGUqIG5vZGUpIGNvbnN0CiB7CiAgICAgaWYgKCFpczxFbGVtZW50Pihub2RlKSkKQEAgLTM1NzEs NyArMzU3OCw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cGVyZm9ybURlZmVycmVkQ2FjaGVVcGRh dGUoKQogICAgIG1fZGVmZXJyZWRNb2RhbENoYW5nZWRMaXN0LmNsZWFyKCk7CiAKICAgICBpZiAo c2hvdWxkUmVjb21wdXRlTW9kYWwpIHsKLSAgICAgICAgdXBkYXRlQ3VycmVudE1vZGFsTm9kZSgp OworICAgICAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKHVwZGF0ZWRGb2N1c2VkRWxlbWVudCA/ IFdpbGxSZWNvbXB1dGVGb2N1czo6Tm8gOiBXaWxsUmVjb21wdXRlRm9jdXM6Olllcyk7CiAgICAg ICAgIC8vICJXaGVuIGEgbW9kYWwgZWxlbWVudCBpcyBkaXNwbGF5ZWQsIGFzc2lzdGl2ZSB0ZWNo bm9sb2dpZXMgU0hPVUxEIG5hdmlnYXRlIHRvIHRoZSBlbGVtZW50IHVubGVzcyBmb2N1cyBoYXMg ZXhwbGljaXRseSBiZWVuIHNldCBlbHNld2hlcmUuIgogICAgICAgICAvLyBgdXBkYXRlZEZvY3Vz ZWRFbGVtZW50YCBpbmRpY2F0ZXMgZm9jdXMgd2FzIGV4cGxpY2l0bHkgc2V0IGVsc2V3aGVyZSwg c28gZG9uJ3QgYXV0b2ZvY3VzIGludG8gdGhlIG1vZGFsLgogICAgICAgICAvLyBodHRwczovL3cz Yy5naXRodWIuaW8vYXJpYS8jYXJpYS1tb2RhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYT2JqZWN0Q2FjaGUuaAppbmRleCA4MDc1OWI0ZmEzYjguLjRjZThmODA4YTdiOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTUxMiw4 ICs1MTIsOCBAQCBwcml2YXRlOgogICAgIC8vIGFyaWEtbW9kYWwgb3IgbW9kYWwgPGRpYWxvZz4g cmVsYXRlZAogICAgIGJvb2wgaXNNb2RhbEVsZW1lbnQoRWxlbWVudCYpIGNvbnN0OwogICAgIHZv aWQgZmluZE1vZGFsTm9kZXMoKTsKLSAgICB2b2lkIHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKTsK LSAgICBFbGVtZW50KiB1cGRhdGVDdXJyZW50TW9kYWxOb2RlSW50ZXJuYWwoKTsKKyAgICBlbnVt IGNsYXNzIFdpbGxSZWNvbXB1dGVGb2N1cyA6IGJvb2wgeyBObywgWWVzIH07CisgICAgdm9pZCB1 cGRhdGVDdXJyZW50TW9kYWxOb2RlKFdpbGxSZWNvbXB1dGVGb2N1cyA9IFdpbGxSZWNvbXB1dGVG b2N1czo6Tm8pOwogICAgIGJvb2wgaXNOb2RlVmlzaWJsZShOb2RlKikgY29uc3Q7CiAgICAgYm9v bCBtb2RhbEVsZW1lbnRIYXNBY2Nlc3NpYmxlQ29udGVudChFbGVtZW50Jik7CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dz LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0 aXBsZS1kaWFsb2dzLWV4cGVjdGVkLnR4dAppbmRleCBhZmFlOTZjNGQ3ZmUuLjJkZDA2YTM2NWEx OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRp cGxlLWRpYWxvZ3MtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv YXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLWV4cGVjdGVkLnR4dApAQCAtMjIsNiArMjIsMTAg QEAgUEFTUzogYmFja2dyb3VuZCBhY2Nlc3NpYmxlOiBmYWxzZQogUEFTUzogI2RpYWxvZzEgYWNj ZXNzaWJsZTogdHJ1ZQogUEFTUzogI2RpYWxvZzIgYWNjZXNzaWJsZTogZmFsc2UKIAorRm9jdXNp bmcgb24gYmFja2dyb3VuZC4KKworUEFTUzogYmFja2dyb3VuZCBhY2Nlc3NpYmxlOiB0cnVlCisK IE1vdmluZyBmb2N1cyBiYWNrIHRvIGZpcnN0IGRlc2NlbmRhbnQgb2YgI2RpYWxvZzIuCiAKIFBB U1M6IGJhY2tncm91bmQgYWNjZXNzaWJsZTogZmFsc2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9ncy5odG1sCmluZGV4 IDM0OTkyOTdmYTE2Yi4uODM2YjMxMGY5MDUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUtZGlhbG9ncy5odG1sCisrKyBiL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBsZS1kaWFsb2dzLmh0bWwKQEAgLTUx LDYgKzUxLDEyIEBACiAgICAgICAgICAgICBhd2FpdCBkaWFsb2cxQWNjZXNzaWJsZSh0cnVlKTsK ICAgICAgICAgICAgIGF3YWl0IGRpYWxvZzJBY2Nlc3NpYmxlKGZhbHNlKTsKIAorICAgICAgICAg ICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL3dhaS1hcmlhLTEuMS8jYXJpYS1tb2RhbAorICAg ICAgICAgICAgLy8gIklmIGZvY3VzIG1vdmVzIHRvIGFuIGVsZW1lbnQgb3V0c2lkZSB0aGUgbW9k YWwgZWxlbWVudCwgYXNzaXN0aXZlIHRlY2hub2xvZ2llcyBTSE9VTEQgTk9UIGxpbWl0IG5hdmln YXRpb24gdG8gdGhlIG1vZGFsIGVsZW1lbnQuIgorICAgICAgICAgICAgdGVzdE91dHB1dCArPSAi XG5Gb2N1c2luZyBvbiBiYWNrZ3JvdW5kLlxuXG4iOworICAgICAgICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInRleHRmaWVsZCIpLmZvY3VzKCk7CisgICAgICAgICAgICBhd2FpdCBiYWNr Z3JvdW5kQWNjZXNzaWJsZSh0cnVlKTsKKwogICAgICAgICAgICAgdGVzdE91dHB1dCArPSAiXG5N b3ZpbmcgZm9jdXMgYmFjayB0byBmaXJzdCBkZXNjZW5kYW50IG9mICNkaWFsb2cyLlxuXG4iOwog ICAgICAgICAgICAgZm9jdXNGaXJzdERlc2NlbmRhbnQoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImRpYWxvZzIiKSk7CiAgICAgICAgICAgICBhd2FpdCBiYWNrZ3JvdW5kQWNjZXNzaWJsZShmYWxz ZSk7Cg==