233688 2021-11-30 23:56:11 -0800 [selectors] :focus-visible should stop matching after blur 2021-12-02 00:07:25 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/31804 InRadar P2 Normal --- 185859 1 rego rego cdumez clopez cmarcelo esprehn+autocc ews-watchlist kangil.han koivisto webkit-bug-importer youennf oldest_to_newest 1819129 0 rego 2021-11-30 23:56:11 -0800 I've been checking the failures on the last patch at https://bugs.webkit.org/show_bug.cgi?id=221925 and it looks like we introduced a bug in r286134 (https://bugs.webkit.org/show_bug.cgi?id=233178) and :focus-visible doesn't stop matching after blur. 1819132 1 445534 rego 2021-11-30 23:59:38 -0800 Created attachment 445534 Patch 1819133 2 ews-watchlist 2021-12-01 00:00:45 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1819134 3 445534 koivisto 2021-12-01 00:11:21 -0800 Comment on attachment 445534 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445534&action=review > Source/WebCore/style/ElementRuleCollector.cpp:161 > + if (matchesFocusPseudoClass(element()) || matchesFocusVisiblePseudoClass(element())) We should understand why matchesFocusPseudoClass is false while matchesFocusVisiblePseudoClass is true. It makes no logical sense, every element with visible focus should have focus. 1819217 4 445571 rego 2021-12-01 06:46:17 -0800 Created attachment 445571 Patch 1819218 5 rego 2021-12-01 06:47:51 -0800 Thanks for the quick review. (In reply to Antti Koivisto from comment #3) > Comment on attachment 445534 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=445534&action=review > > > Source/WebCore/style/ElementRuleCollector.cpp:161 > > + if (matchesFocusPseudoClass(element()) || matchesFocusVisiblePseudoClass(element())) > > We should understand why matchesFocusPseudoClass is false while > matchesFocusVisiblePseudoClass is true. It makes no logical sense, every > element with visible focus should have focus. Yeah you're right, the actual problem was in Element::setFocus(). We are using there Style::PseudoClassChangeInvalidation for :focus, but that was used before focus-visible flag was set, and thus the flags were out of sync during invalidation. The new version of the patch fixes that. PTAL. 1819227 6 445571 koivisto 2021-12-01 07:34:58 -0800 Comment on attachment 445571 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445571&action=review > Source/WebCore/dom/Element.cpp:-847 > - Style::PseudoClassChangeInvalidation styleInvalidation(*this, CSSSelector::PseudoClassFocusVisible); I see direct call to setHasFocusVisible in EventHandler::internalKeyEvent(). Would that miss invalidation now? Does that case have a test? 1819248 7 445571 rego 2021-12-01 08:20:42 -0800 Comment on attachment 445571 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445571&action=review >> Source/WebCore/dom/Element.cpp:-847 >> - Style::PseudoClassChangeInvalidation styleInvalidation(*this, CSSSelector::PseudoClassFocusVisible); > > I see direct call to setHasFocusVisible in EventHandler::internalKeyEvent(). Would that miss invalidation now? > > Does that case have a test? Yes there's a test and it actually failed due to that. 1819253 8 445577 rego 2021-12-01 08:22:47 -0800 Created attachment 445577 Patch 1819286 9 445577 koivisto 2021-12-01 09:38:03 -0800 Comment on attachment 445577 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445577&action=review > Source/WebCore/dom/Element.cpp:855 > - Style::PseudoClassChangeInvalidation styleInvalidation(*this, CSSSelector::PseudoClassFocusVisible); > + if (invalidation == Invalidation::PseudoClass) > + Style::PseudoClassChangeInvalidation styleInvalidation(*this, CSSSelector::PseudoClassFocusVisible); > document().userActionElements().setHasFocusVisible(*this, flag); This won't work, PseudoClassChangeInvalidation needs to be scoped around the the mutation (setting focus visible flag) as invalidation needs to run in both the tree before and after the mutation (from constructor and destructor). Surprised this doesn't break tests. I don't think you need to do this change though. The only change that is needed is to call setHasFocusVisible within the scope of focusStyleInvalidation. 1819289 10 koivisto 2021-12-01 09:41:39 -0800 Well, I suppose you actually need to do something like this get consistent scopes. Easiest thing to do is to just add PseudoClassChangeInvalidation to the caller of setHasFocusVisible. 1819569 11 445671 rego 2021-12-01 22:02:24 -0800 Created attachment 445671 Patch 1819570 12 rego 2021-12-01 22:03:09 -0800 (In reply to Antti Koivisto from comment #10) > Easiest thing to do is to just add PseudoClassChangeInvalidation to the > caller of setHasFocusVisible. Ok, I've done this in a new version of the patch. Thanks again for the review. 1819600 13 ews-feeder 2021-12-02 00:06:31 -0800 Committed r286415 (244761@main): <https://commits.webkit.org/244761@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445671. 1819601 14 webkit-bug-importer 2021-12-02 00:07:25 -0800 <rdar://problem/85958613> 445534 2021-11-30 23:59:38 -0800 2021-12-01 06:46:11 -0800 Patch bug-233688-20211201085936.patch text/plain 5114 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Mjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWM3ZGEyZDg2MTA3NWE4 NDJkMTA3YjE1NzM0NDJlODdlNDZjNTAxZi4uNTJhYzMxN2M1MDkzMTIyNzM1MjFjZDFlYTU1MGEz MDllZjNlMWRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTMwICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtzZWxlY3Rv cnNdIDpmb2N1cy12aXNpYmxlIHNob3VsZCBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5o dG1sCisKKyAgICAgICAgKiBzdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6RWxlbWVudFJ1bGVDb2xsZWN0b3I6OmNvbGxlY3RNYXRjaGluZ1J1 bGVzKTogQ2hlY2sgaWYgdGhlIGVsZW1lbnQgbWF0Y2hlcyA6Zm9jdXMtdmlzaWJsZS4KKwogMjAy MS0xMS0zMCAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVIFByb2Nlc3NdIENhbGN1bGF0ZSB0aGUgcmVzdWx0IGltYWdlIHJlY3RhbmdsZSBvZiB0aGUg RmlsdGVyRWZmZWN0IGluIGZpbHRlciBjb29yZGluYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5 bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCmluZGV4IGZiNjFmZGRjYWI5ZTFkMTM1YjkyNGJl ODQ0ZWFiOTQxNzc2NDIxNGYuLmI2NzRlYjM4MjJlNjNmZmQ4MmNmYzUxY2E5OGFkODRlMGE5NjZm YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAK QEAgLTE1OCw3ICsxNTgsNyBAQCB2b2lkIEVsZW1lbnRSdWxlQ29sbGVjdG9yOjpjb2xsZWN0TWF0 Y2hpbmdSdWxlcyhjb25zdCBNYXRjaFJlcXVlc3QmIG1hdGNoUmVxdWVzdAogCiAgICAgaWYgKGVs ZW1lbnQoKS5pc0xpbmsoKSkKICAgICAgICAgY29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KG1h dGNoUmVxdWVzdC5ydWxlU2V0LT5saW5rUHNldWRvQ2xhc3NSdWxlcygpLCBtYXRjaFJlcXVlc3Qp OwotICAgIGlmIChtYXRjaGVzRm9jdXNQc2V1ZG9DbGFzcyhlbGVtZW50KCkpKQorICAgIGlmICht YXRjaGVzRm9jdXNQc2V1ZG9DbGFzcyhlbGVtZW50KCkpIHx8IG1hdGNoZXNGb2N1c1Zpc2libGVQ c2V1ZG9DbGFzcyhlbGVtZW50KCkpKQogICAgICAgICBjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxp c3QobWF0Y2hSZXF1ZXN0LnJ1bGVTZXQtPmZvY3VzUHNldWRvQ2xhc3NSdWxlcygpLCBtYXRjaFJl cXVlc3QpOwogICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdChtYXRjaFJlcXVlc3QucnVs ZVNldC0+dGFnUnVsZXMoZWxlbWVudCgpLmxvY2FsTmFtZSgpLCBlbGVtZW50KCkuaXNIVE1MRWxl bWVudCgpICYmIGVsZW1lbnQoKS5kb2N1bWVudCgpLmlzSFRNTERvY3VtZW50KCkpLCBtYXRjaFJl cXVlc3QpOwogICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdChtYXRjaFJlcXVlc3QucnVs ZVNldC0+dW5pdmVyc2FsUnVsZXMoKSwgbWF0Y2hSZXF1ZXN0KTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCmluZGV4IDZlN2NiODZmNzgwMDJhMzY2MDJmNzA5YjMxNTQ0NGE4YTA0N2E2M2Mu LmFhNjhkYmI0MTM1YzEwZTZhYzAwZjZjYTg0MGI5ODBhYTI2MzEyZTkgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTExLTMwICBNYW51ZWwgUmVn byBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtzZWxlY3RvcnNdIDpm b2N1cy12aXNpYmxlIHNob3VsZCBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY4OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBuZXcgdGVzdCB0byBjaGVj ayB0aGF0IDpmb2N1cy12aXNpYmxlIHN0b3AgbWF0Y2hpbmcgYWZ0ZXIgYmx1ci4KKworICAgICAg ICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxl Y3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMuaHRtbDogQWRkZWQuCisKIDIwMjEtMTEtMjkgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgaW5pdGlhbCBpbXBsZW1l bnRhdGlvbiBmb3IgdGhlIFdlYiBMb2NrIEFQSQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUt MDIzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNzM1MTJjZGJkNDMyZTFiYjc3ZmY2OTMxOTgzZjhlYzExYjlkMWQ3MgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBA CitUYXJnZXQKKworUEFTUyAiOmZvY3VzLXZpc2libGUiIHNob3VsZCBiZSBhIHZhbGlkIHNlbGVj dG9yCitQQVNTIDpmb2N1cy12aXNpYmxlIHN0b3AgbWF0Y2hpbmcgYWZ0ZXIgYmx1cgorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9z ZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmE5MGJiMDdiNzI5M2NjNzAyYmZlMWM3NjI2ZmUwNzhhYmNmZmFmMjgKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMuaHRtbApAQCAtMCwwICsxLDMzIEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04IiAvPgorPHRpdGxlPkNTUyBU ZXN0IChTZWxlY3RvcnMpOiBFbGVtZW50IGRvZXNuJ3QgbWF0Y2ggOmZvY3VzLXZpc2libGVsIGFm dGVyIGJsdXI8L3RpdGxlPgorPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJNYW51ZWwgUmVnbyBD YXNhc25vdmFzIiBocmVmPSJtYWlsdG86cmVnb0BpZ2FsaWEuY29tIj4KKzxsaW5rIHJlbD0iaGVs cCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3NlbGVjdG9ycy00LyN0aGUtZm9jdXMt dmlzaWJsZS1wc2V1ZG8iIC8+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL2Nzcy9zdXBwb3J0L3BhcnNpbmctdGVzdGNvbW1v bi5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisgIDpmb2N1cy12aXNpYmxlIHsKKyAgICBvdXRsaW5l OiBncmVlbiBzb2xpZCA1cHg7CisgIH0KKzwvc3R5bGU+CisKKzxkaXYgaWQ9InRhcmdldCIgdGFi aW5kZXg9IjAiPlRhcmdldDwvZGl2PgorPHNjcmlwdD4KKyAgLy8gQ2hlY2sgdGhhdCA6Zm9jdXMt dmlzaWJsZSBpcyBzdXBwb3J0ZWQuCisgIHRlc3RfdmFsaWRfc2VsZWN0b3IoJzpmb2N1cy12aXNp YmxlJyk7CisKKyAgYXN5bmNfdGVzdChmdW5jdGlvbih0KSB7CisgICAgdGFyZ2V0LmFkZEV2ZW50 TGlzdGVuZXIoImZvY3VzIiwgdC5zdGVwX2Z1bmMoZnVuY3Rpb24oKSB7CisgICAgICBhc3NlcnRf ZXF1YWxzKGdldENvbXB1dGVkU3R5bGUodGFyZ2V0KS5vdXRsaW5lU3R5bGUsICJzb2xpZCIsIGBv dXRsaW5lLXN0eWxlIGZvciAke3RhcmdldC50YWdOYW1lfSMke3RhcmdldC5pZH0gc2hvdWxkIGJl IHNvbGlkYCk7CisgICAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5bGUodGFyZ2V0KS5v dXRsaW5lQ29sb3IsICJyZ2IoMCwgMTI4LCAwKSIsIGBvdXRsaW5lQ29sb3IgZm9yICR7dGFyZ2V0 LnRhZ05hbWV9IyR7dGFyZ2V0LmlkfSBzaG91bGQgYmUgZ3JlZW5gKTsKKyAgICAgIHRhcmdldC5i bHVyKCk7CisgICAgfSkpOworICAgIHRhcmdldC5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwgdC5z dGVwX2Z1bmMoZnVuY3Rpb24oKSB7CisgICAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5 bGUodGFyZ2V0KS5vdXRsaW5lU3R5bGUsICJub25lIiwgYG91dGxpbmUtc3R5bGUgZm9yICR7dGFy Z2V0LnRhZ05hbWV9IyR7dGFyZ2V0LmlkfSBzaG91bGQgYmUgbm9uZWApOworICAgICAgdC5kb25l KCk7CisgICAgfSkpOworICAgIHRhcmdldC5mb2N1cygpOworICB9LCAiOmZvY3VzLXZpc2libGUg c3RvcCBtYXRjaGluZyBhZnRlciBibHVyIik7Cis8L3NjcmlwdD4KKwo= 445571 2021-12-01 06:46:17 -0800 2021-12-01 08:22:42 -0800 Patch bug-233688-20211201154615.patch text/plain 6625 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Mjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWM3ZGEyZDg2MTA3NWE4 NDJkMTA3YjE1NzM0NDJlODdlNDZjNTAxZi4uYjc3ZGRkMDBlM2NlZGVmZTVjNDYwZmIzNDllY2My NWM3MWQxMDliZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTMwICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtzZWxlY3Rv cnNdIDpmb2N1cy12aXNpYmxlIHNob3VsZCBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgUHNldWRvQ2xh c3NDaGFuZ2VJbnZhbGlkYXRpb24gZm9yIDpmb2N1cy12aXNpYmxlIHRvZ2V0aGVyIHdpdGggdGhl IG9uZSBmb3IgOmZvY3VzLAorICAgICAgICBhcyB3ZSBuZWVkIHRvIGtlZXAgYm90aCBmbGFncyBp biBzeW5jIHdoZW4gY29tcHV0aW5nIHRoZSBpbnZhbGlkYXRpb25zCisgICAgICAgIChpdCdzIG5v dCBwb3NzaWJsZSB0byBoYXZlIGFuIGVsZW1lbnQgdGhhdCBtYXRjaGVzIDpmb2N1cy12aXNpYmxl IGJ1dCBub3QgOmZvY3VzLAorICAgICAgICBhbmQgdGhhdCB3YXMgaGFwcGVuaW5nIGJlZm9yZSB0 aGlzIGNoYW5nZSkuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwKKworICAgICAgICAqIGRv bS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldEZvY3VzKToKKyAg ICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldEhhc0ZvY3VzVmlzaWJsZSk6CisKIDIwMjEtMTEt MzAgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQ cm9jZXNzXSBDYWxjdWxhdGUgdGhlIHJlc3VsdCBpbWFnZSByZWN0YW5nbGUgb2YgdGhlIEZpbHRl ckVmZmVjdCBpbiBmaWx0ZXIgY29vcmRpbmF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCA5 ODQyMWY0MzAwMzNiNzkyYzdlMjczNWU2MDUwMTUxNzIyYzBlMjYzLi42NTRjMzZlZDlkMDRmMzVj MTYxOGE5MjcwM2JmY2ZmMDM0ZWZjZWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC04MTUs MjAgKzgxNSwyMSBAQCB2b2lkIEVsZW1lbnQ6OnNldEZvY3VzKGJvb2wgZmxhZywgRm9jdXNWaXNp YmlsaXR5IHZpc2liaWxpdHkpCiAgICAgICAgIHJldHVybjsKICAgICB7CiAgICAgICAgIFN0eWxl OjpQc2V1ZG9DbGFzc0NoYW5nZUludmFsaWRhdGlvbiBmb2N1c1N0eWxlSW52YWxpZGF0aW9uKCp0 aGlzLCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1cyk7CisgICAgICAgIFN0eWxlOjpQc2V1 ZG9DbGFzc0NoYW5nZUludmFsaWRhdGlvbiBmb2N1c1Zpc2libGVTdHlsZUludmFsaWRhdGlvbigq dGhpcywgQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzRm9jdXNWaXNpYmxlKTsKICAgICAgICAgU3R5 bGU6OlBzZXVkb0NsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIGRpcmVjdEZvY3VzU3R5bGVJbnZhbGlk YXRpb24oKnRoaXMsIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc0RpcmVjdEZvY3VzKTsKICAgICAg ICAgZG9jdW1lbnQoKS51c2VyQWN0aW9uRWxlbWVudHMoKS5zZXRGb2N1c2VkKCp0aGlzLCBmbGFn KTsKLSAgICB9CiAKLSAgICAvLyBTaGFkb3cgaG9zdCB3aXRoIGEgc2xvdCB0aGF0IGNvbnRhaW4g Zm9jdXNlZCBlbGVtZW50IGlzIG5vdCBjb25zaWRlcmVkIGZvY3VzZWQuCi0gICAgZm9yIChhdXRv KiByb290ID0gY29udGFpbmluZ1NoYWRvd1Jvb3QoKTsgcm9vdDsgcm9vdCA9IHJvb3QtPmhvc3Qo KS0+Y29udGFpbmluZ1NoYWRvd1Jvb3QoKSkgewotICAgICAgICByb290LT5zZXRDb250YWluc0Zv Y3VzZWRFbGVtZW50KGZsYWcpOwotICAgICAgICByb290LT5ob3N0KCktPmludmFsaWRhdGVTdHls ZSgpOwotICAgIH0KKyAgICAgICAgLy8gU2hhZG93IGhvc3Qgd2l0aCBhIHNsb3QgdGhhdCBjb250 YWluIGZvY3VzZWQgZWxlbWVudCBpcyBub3QgY29uc2lkZXJlZCBmb2N1c2VkLgorICAgICAgICBm b3IgKGF1dG8qIHJvb3QgPSBjb250YWluaW5nU2hhZG93Um9vdCgpOyByb290OyByb290ID0gcm9v dC0+aG9zdCgpLT5jb250YWluaW5nU2hhZG93Um9vdCgpKSB7CisgICAgICAgICAgICByb290LT5z ZXRDb250YWluc0ZvY3VzZWRFbGVtZW50KGZsYWcpOworICAgICAgICAgICAgcm9vdC0+aG9zdCgp LT5pbnZhbGlkYXRlU3R5bGUoKTsKKyAgICAgICAgfQogCi0gICAgZm9yIChhdXRvKiBlbGVtZW50 ID0gdGhpczsgZWxlbWVudDsgZWxlbWVudCA9IGVsZW1lbnQtPnBhcmVudEVsZW1lbnRJbkNvbXBv c2VkVHJlZSgpKQotICAgICAgICBlbGVtZW50LT5zZXRIYXNGb2N1c1dpdGhpbihmbGFnKTsKKyAg ICAgICAgZm9yIChhdXRvKiBlbGVtZW50ID0gdGhpczsgZWxlbWVudDsgZWxlbWVudCA9IGVsZW1l bnQtPnBhcmVudEVsZW1lbnRJbkNvbXBvc2VkVHJlZSgpKQorICAgICAgICAgICAgZWxlbWVudC0+ c2V0SGFzRm9jdXNXaXRoaW4oZmxhZyk7CiAKLSAgICBzZXRIYXNGb2N1c1Zpc2libGUoZmxhZyAm JiAodmlzaWJpbGl0eSA9PSBGb2N1c1Zpc2liaWxpdHk6OlZpc2libGUgfHwgc2hvdWxkQWx3YXlz SGF2ZUZvY3VzVmlzaWJsZVdoZW5Gb2N1c2VkKCp0aGlzKSkpOworICAgICAgICBzZXRIYXNGb2N1 c1Zpc2libGUoZmxhZyAmJiAodmlzaWJpbGl0eSA9PSBGb2N1c1Zpc2liaWxpdHk6OlZpc2libGUg fHwgc2hvdWxkQWx3YXlzSGF2ZUZvY3VzVmlzaWJsZVdoZW5Gb2N1c2VkKCp0aGlzKSkpOworICAg IH0KIH0KIAogdm9pZCBFbGVtZW50OjpzZXRIYXNGb2N1c1Zpc2libGUoYm9vbCBmbGFnKQpAQCAt ODQ0LDcgKzg0NSw2IEBAIHZvaWQgRWxlbWVudDo6c2V0SGFzRm9jdXNWaXNpYmxlKGJvb2wgZmxh ZykKICAgICBpZiAoaGFzRm9jdXNWaXNpYmxlKCkgPT0gZmxhZykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgU3R5bGU6OlBzZXVkb0NsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIHN0eWxlSW52YWxpZGF0 aW9uKCp0aGlzLCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1c1Zpc2libGUpOwogICAgIGRv Y3VtZW50KCkudXNlckFjdGlvbkVsZW1lbnRzKCkuc2V0SGFzRm9jdXNWaXNpYmxlKCp0aGlzLCBm bGFnKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNmU3Y2I4NmY3ODAw MmEzNjYwMmY3MDliMzE1NDQ0YThhMDQ3YTYzYy4uYWE2OGRiYjQxMzVjMTBlNmFjMDBmNmNhODQw Yjk4MGFhMjYzMTJlOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMjEtMTEtMzAgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5j b20+CisKKyAgICAgICAgW3NlbGVjdG9yc10gOmZvY3VzLXZpc2libGUgc2hvdWxkIHN0b3AgbWF0 Y2hpbmcgYWZ0ZXIgYmx1cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMzNjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIG5ldyB0ZXN0IHRvIGNoZWNrIHRoYXQgOmZvY3VzLXZpc2libGUgc3RvcCBt YXRjaGluZyBhZnRlciBibHVyLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9z ZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5odG1s OiBBZGRlZC4KKwogMjAyMS0xMS0yOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBpbml0aWFsIGltcGxlbWVudGF0aW9uIGZvciB0aGUgV2ViIExvY2sgQVBJ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZp c2libGUtMDIzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MzUxMmNkYmQ0MzJlMWJiNzdmZjY5 MzE5ODNmOGVjMTFiOWQxZDcyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIz LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1RhcmdldAorCitQQVNTICI6Zm9jdXMtdmlz aWJsZSIgc2hvdWxkIGJlIGEgdmFsaWQgc2VsZWN0b3IKK1BBU1MgOmZvY3VzLXZpc2libGUgc3Rv cCBtYXRjaGluZyBhZnRlciBibHVyCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5o dG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2Vs ZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTkwYmIwN2I3MjkzY2M3 MDJiZmUxYzc2MjZmZTA3OGFiY2ZmYWYyOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNp YmxlLTAyMy5odG1sCkBAIC0wLDAgKzEsMzMgQEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hh cnNldD0idXRmLTgiIC8+Cis8dGl0bGU+Q1NTIFRlc3QgKFNlbGVjdG9ycyk6IEVsZW1lbnQgZG9l c24ndCBtYXRjaCA6Zm9jdXMtdmlzaWJsZWwgYWZ0ZXIgYmx1cjwvdGl0bGU+Cis8bGluayByZWw9 ImF1dGhvciIgdGl0bGU9Ik1hbnVlbCBSZWdvIENhc2Fzbm92YXMiIGhyZWY9Im1haWx0bzpyZWdv QGlnYWxpYS5jb20iPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3 Zy5vcmcvc2VsZWN0b3JzLTQvI3RoZS1mb2N1cy12aXNpYmxlLXBzZXVkbyIgLz4KKzxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIv cmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIv Y3NzL3N1cHBvcnQvcGFyc2luZy10ZXN0Y29tbW9uLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKyAg OmZvY3VzLXZpc2libGUgeworICAgIG91dGxpbmU6IGdyZWVuIHNvbGlkIDVweDsKKyAgfQorPC9z dHlsZT4KKworPGRpdiBpZD0idGFyZ2V0IiB0YWJpbmRleD0iMCI+VGFyZ2V0PC9kaXY+Cis8c2Ny aXB0PgorICAvLyBDaGVjayB0aGF0IDpmb2N1cy12aXNpYmxlIGlzIHN1cHBvcnRlZC4KKyAgdGVz dF92YWxpZF9zZWxlY3RvcignOmZvY3VzLXZpc2libGUnKTsKKworICBhc3luY190ZXN0KGZ1bmN0 aW9uKHQpIHsKKyAgICB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0LnN0ZXBfZnVu YyhmdW5jdGlvbigpIHsKKyAgICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJn ZXQpLm91dGxpbmVTdHlsZSwgInNvbGlkIiwgYG91dGxpbmUtc3R5bGUgZm9yICR7dGFyZ2V0LnRh Z05hbWV9IyR7dGFyZ2V0LmlkfSBzaG91bGQgYmUgc29saWRgKTsKKyAgICAgIGFzc2VydF9lcXVh bHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLm91dGxpbmVDb2xvciwgInJnYigwLCAxMjgsIDAp IiwgYG91dGxpbmVDb2xvciBmb3IgJHt0YXJnZXQudGFnTmFtZX0jJHt0YXJnZXQuaWR9IHNob3Vs ZCBiZSBncmVlbmApOworICAgICAgdGFyZ2V0LmJsdXIoKTsKKyAgICB9KSk7CisgICAgdGFyZ2V0 LmFkZEV2ZW50TGlzdGVuZXIoImJsdXIiLCB0LnN0ZXBfZnVuYyhmdW5jdGlvbigpIHsKKyAgICAg IGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLm91dGxpbmVTdHlsZSwgIm5v bmUiLCBgb3V0bGluZS1zdHlsZSBmb3IgJHt0YXJnZXQudGFnTmFtZX0jJHt0YXJnZXQuaWR9IHNo b3VsZCBiZSBub25lYCk7CisgICAgICB0LmRvbmUoKTsKKyAgICB9KSk7CisgICAgdGFyZ2V0LmZv Y3VzKCk7CisgIH0sICI6Zm9jdXMtdmlzaWJsZSBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIiKTsK Kzwvc2NyaXB0PgorCg== 445577 2021-12-01 08:22:47 -0800 2021-12-01 22:02:19 -0800 Patch bug-233688-20211201172246.patch text/plain 7731 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Mjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWM3ZGEyZDg2MTA3NWE4 NDJkMTA3YjE1NzM0NDJlODdlNDZjNTAxZi4uMzZhOTVhMTVhMjUyMzI0MDYzMGIzYTZkMmIyMjc1 MWQ5NTY3Mjc2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTAxICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtzZWxlY3Rv cnNdIDpmb2N1cy12aXNpYmxlIHNob3VsZCBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBQc2V1ZG9DbGFz c0NoYW5nZUludmFsaWRhdGlvbiBmb3IgOmZvY3VzLXZpc2libGUgdG9nZXRoZXIgd2l0aCB0aGUg b25lIGZvciA6Zm9jdXMsCisgICAgICAgIGFzIHdlIG5lZWQgdG8ga2VlcCBib3RoIGZsYWdzIGlu IHN5bmMgd2hlbiBjb21wdXRpbmcgdGhlIGludmFsaWRhdGlvbnMKKyAgICAgICAgKGl0J3Mgbm90 IHBvc3NpYmxlIHRvIGhhdmUgYW4gZWxlbWVudCB0aGF0IG1hdGNoZXMgOmZvY3VzLXZpc2libGUg YnV0IG5vdCA6Zm9jdXMsCisgICAgICAgIGFuZCB0aGF0IHdhcyBoYXBwZW5pbmcgYmVmb3JlIHRo aXMgY2hhbmdlKS4KKworICAgICAgICBLZWVwIHRoZSBpbnZhbGlkYXRpb24gaW4gc2V0SGFzRm9j dXNWaXNpYmxlKCkgd2hlbiBpdCdzIGNhbGxlZCBmcm9tIG90aGVyIHBsYWNlcy4KKworICAgICAg ICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxlY3RvcnMvZm9j dXMtdmlzaWJsZS0wMjMuaHRtbAorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0Rm9jdXMpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVu dDo6c2V0SGFzRm9jdXNWaXNpYmxlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorCiAyMDIx LTExLTMwICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtH UFUgUHJvY2Vzc10gQ2FsY3VsYXRlIHRoZSByZXN1bHQgaW1hZ2UgcmVjdGFuZ2xlIG9mIHRoZSBG aWx0ZXJFZmZlY3QgaW4gZmlsdGVyIGNvb3JkaW5hdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5k ZXggOTg0MjFmNDMwMDMzYjc5MmM3ZTI3MzVlNjA1MDE1MTcyMmMwZTI2My4uYWZmOTEzZmU5NmZh Nzg5OWU2N2Q2YzdhY2RlZDkyMjM3NTAzM2I3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAt ODE1LDIzICs4MTUsMjkgQEAgdm9pZCBFbGVtZW50OjpzZXRGb2N1cyhib29sIGZsYWcsIEZvY3Vz VmlzaWJpbGl0eSB2aXNpYmlsaXR5KQogICAgICAgICByZXR1cm47CiAgICAgewogICAgICAgICBT dHlsZTo6UHNldWRvQ2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24gZm9jdXNTdHlsZUludmFsaWRhdGlv bigqdGhpcywgQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzRm9jdXMpOworICAgICAgICBTdHlsZTo6 UHNldWRvQ2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24gZm9jdXNWaXNpYmxlU3R5bGVJbnZhbGlkYXRp b24oKnRoaXMsIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc0ZvY3VzVmlzaWJsZSk7CiAgICAgICAg IFN0eWxlOjpQc2V1ZG9DbGFzc0NoYW5nZUludmFsaWRhdGlvbiBkaXJlY3RGb2N1c1N0eWxlSW52 YWxpZGF0aW9uKCp0aGlzLCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NEaXJlY3RGb2N1cyk7CiAg ICAgICAgIGRvY3VtZW50KCkudXNlckFjdGlvbkVsZW1lbnRzKCkuc2V0Rm9jdXNlZCgqdGhpcywg ZmxhZyk7Ci0gICAgfQogCi0gICAgLy8gU2hhZG93IGhvc3Qgd2l0aCBhIHNsb3QgdGhhdCBjb250 YWluIGZvY3VzZWQgZWxlbWVudCBpcyBub3QgY29uc2lkZXJlZCBmb2N1c2VkLgotICAgIGZvciAo YXV0byogcm9vdCA9IGNvbnRhaW5pbmdTaGFkb3dSb290KCk7IHJvb3Q7IHJvb3QgPSByb290LT5o b3N0KCktPmNvbnRhaW5pbmdTaGFkb3dSb290KCkpIHsKLSAgICAgICAgcm9vdC0+c2V0Q29udGFp bnNGb2N1c2VkRWxlbWVudChmbGFnKTsKLSAgICAgICAgcm9vdC0+aG9zdCgpLT5pbnZhbGlkYXRl U3R5bGUoKTsKLSAgICB9CisgICAgICAgIC8vIFNoYWRvdyBob3N0IHdpdGggYSBzbG90IHRoYXQg Y29udGFpbiBmb2N1c2VkIGVsZW1lbnQgaXMgbm90IGNvbnNpZGVyZWQgZm9jdXNlZC4KKyAgICAg ICAgZm9yIChhdXRvKiByb290ID0gY29udGFpbmluZ1NoYWRvd1Jvb3QoKTsgcm9vdDsgcm9vdCA9 IHJvb3QtPmhvc3QoKS0+Y29udGFpbmluZ1NoYWRvd1Jvb3QoKSkgeworICAgICAgICAgICAgcm9v dC0+c2V0Q29udGFpbnNGb2N1c2VkRWxlbWVudChmbGFnKTsKKyAgICAgICAgICAgIHJvb3QtPmhv c3QoKS0+aW52YWxpZGF0ZVN0eWxlKCk7CisgICAgICAgIH0KIAotICAgIGZvciAoYXV0byogZWxl bWVudCA9IHRoaXM7IGVsZW1lbnQ7IGVsZW1lbnQgPSBlbGVtZW50LT5wYXJlbnRFbGVtZW50SW5D b21wb3NlZFRyZWUoKSkKLSAgICAgICAgZWxlbWVudC0+c2V0SGFzRm9jdXNXaXRoaW4oZmxhZyk7 CisgICAgICAgIGZvciAoYXV0byogZWxlbWVudCA9IHRoaXM7IGVsZW1lbnQ7IGVsZW1lbnQgPSBl bGVtZW50LT5wYXJlbnRFbGVtZW50SW5Db21wb3NlZFRyZWUoKSkKKyAgICAgICAgICAgIGVsZW1l bnQtPnNldEhhc0ZvY3VzV2l0aGluKGZsYWcpOwogCi0gICAgc2V0SGFzRm9jdXNWaXNpYmxlKGZs YWcgJiYgKHZpc2liaWxpdHkgPT0gRm9jdXNWaXNpYmlsaXR5OjpWaXNpYmxlIHx8IHNob3VsZEFs d2F5c0hhdmVGb2N1c1Zpc2libGVXaGVuRm9jdXNlZCgqdGhpcykpKTsKKyAgICAgICAgc2V0SGFz Rm9jdXNWaXNpYmxlKGZsYWcgJiYgKHZpc2liaWxpdHkgPT0gRm9jdXNWaXNpYmlsaXR5OjpWaXNp YmxlIHx8IHNob3VsZEFsd2F5c0hhdmVGb2N1c1Zpc2libGVXaGVuRm9jdXNlZCgqdGhpcykpLCBJ bnZhbGlkYXRpb246Ok5vbmUpOworICAgIH0KIH0KIAogdm9pZCBFbGVtZW50OjpzZXRIYXNGb2N1 c1Zpc2libGUoYm9vbCBmbGFnKQoreworICAgIHNldEhhc0ZvY3VzVmlzaWJsZShmbGFnLCBJbnZh bGlkYXRpb246OlBzZXVkb0NsYXNzKTsKK30KKwordm9pZCBFbGVtZW50OjpzZXRIYXNGb2N1c1Zp c2libGUoYm9vbCBmbGFnLCBJbnZhbGlkYXRpb24gaW52YWxpZGF0aW9uKQogewogICAgIGlmICgh ZG9jdW1lbnQoKS5zZXR0aW5ncygpLmZvY3VzVmlzaWJsZUVuYWJsZWQoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtODQ0LDcgKzg1MCw4IEBAIHZvaWQgRWxlbWVudDo6c2V0SGFzRm9jdXNWaXNpYmxl KGJvb2wgZmxhZykKICAgICBpZiAoaGFzRm9jdXNWaXNpYmxlKCkgPT0gZmxhZykKICAgICAgICAg cmV0dXJuOwogCi0gICAgU3R5bGU6OlBzZXVkb0NsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIHN0eWxl SW52YWxpZGF0aW9uKCp0aGlzLCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1c1Zpc2libGUp OworICAgIGlmIChpbnZhbGlkYXRpb24gPT0gSW52YWxpZGF0aW9uOjpQc2V1ZG9DbGFzcykKKyAg ICAgICAgU3R5bGU6OlBzZXVkb0NsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIHN0eWxlSW52YWxpZGF0 aW9uKCp0aGlzLCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1c1Zpc2libGUpOwogICAgIGRv Y3VtZW50KCkudXNlckFjdGlvbkVsZW1lbnRzKCkuc2V0SGFzRm9jdXNWaXNpYmxlKCp0aGlzLCBm bGFnKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKaW5kZXggZmE5NDdiZjExY2Q5NjFhODcxZTc1NjM2 YzY2MzE3YjQzMGE5MjQ3Yi4uNGZiZTM5OGY1MTM3ZWUyM2QxYTk5ZmZkZjYyZTlkZjU5YTFiMmI2 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5oCkBAIC02ODcsNiArNjg3LDggQEAgcHJpdmF0ZToKICAgICBi b29sIGlzVXNlckFjdGlvbkVsZW1lbnREcmFnZ2VkKCkgY29uc3Q7CiAgICAgYm9vbCBpc1VzZXJB Y3Rpb25FbGVtZW50SGFzRm9jdXNWaXNpYmxlKCkgY29uc3Q7CiAgICAgYm9vbCBpc1VzZXJBY3Rp b25FbGVtZW50SGFzRm9jdXNXaXRoaW4oKSBjb25zdDsKKyAgICBlbnVtIGNsYXNzIEludmFsaWRh dGlvbiB7IE5vbmUsIFBzZXVkb0NsYXNzIH07CisgICAgdm9pZCBzZXRIYXNGb2N1c1Zpc2libGUo Ym9vbCBmbGFnLCBJbnZhbGlkYXRpb24pOwogCiAgICAgdmlydHVhbCB2b2lkIGRpZEFkZFVzZXJB Z2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCYpIHsgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwppbmRleCA2ZTdjYjg2Zjc4MDAyYTM2NjAyZjcwOWIzMTU0NDRhOGEwNDdhNjNjLi5hYTY4 ZGJiNDEzNWMxMGU2YWMwMGY2Y2E4NDBiOTgwYWEyNjMxMmU5IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMS0zMCAgTWFudWVsIFJlZ28gQ2Fz YXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KKworICAgICAgICBbc2VsZWN0b3JzXSA6Zm9jdXMt dmlzaWJsZSBzaG91bGQgc3RvcCBtYXRjaGluZyBhZnRlciBibHVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM2ODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbmV3IHRlc3QgdG8gY2hlY2sgdGhh dCA6Zm9jdXMtdmlzaWJsZSBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIuCisKKyAgICAgICAgKiB3 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3Jz L2ZvY3VzLXZpc2libGUtMDIzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTExLTI5ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGluaXRpYWwgaW1wbGVtZW50YXRp b24gZm9yIHRoZSBXZWIgTG9jayBBUEkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjczNTEyY2RiZDQzMmUxYmI3N2ZmNjkzMTk4M2Y4ZWMxMWI5ZDFkNzIKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxl Y3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorVGFy Z2V0CisKK1BBU1MgIjpmb2N1cy12aXNpYmxlIiBzaG91bGQgYmUgYSB2YWxpZCBzZWxlY3Rvcgor UEFTUyA6Zm9jdXMtdmlzaWJsZSBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0 b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5hOTBiYjA3YjcyOTNjYzcwMmJmZTFjNzYyNmZlMDc4YWJjZmZhZjI4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwKQEAgLTAsMCArMSwzMyBAQAorPCFE T0NUWVBFIGh0bWw+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCIgLz4KKzx0aXRsZT5DU1MgVGVzdCAo U2VsZWN0b3JzKTogRWxlbWVudCBkb2Vzbid0IG1hdGNoIDpmb2N1cy12aXNpYmxlbCBhZnRlciBi bHVyPC90aXRsZT4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iTWFudWVsIFJlZ28gQ2FzYXNu b3ZhcyIgaHJlZj0ibWFpbHRvOnJlZ29AaWdhbGlhLmNvbSI+Cis8bGluayByZWw9ImhlbHAiIGhy ZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9zZWxlY3RvcnMtNC8jdGhlLWZvY3VzLXZpc2li bGUtcHNldWRvIiAvPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9jc3Mvc3VwcG9ydC9wYXJzaW5nLXRlc3Rjb21tb24uanMi Pjwvc2NyaXB0PgorPHN0eWxlPgorICA6Zm9jdXMtdmlzaWJsZSB7CisgICAgb3V0bGluZTogZ3Jl ZW4gc29saWQgNXB4OworICB9Cis8L3N0eWxlPgorCis8ZGl2IGlkPSJ0YXJnZXQiIHRhYmluZGV4 PSIwIj5UYXJnZXQ8L2Rpdj4KKzxzY3JpcHQ+CisgIC8vIENoZWNrIHRoYXQgOmZvY3VzLXZpc2li bGUgaXMgc3VwcG9ydGVkLgorICB0ZXN0X3ZhbGlkX3NlbGVjdG9yKCc6Zm9jdXMtdmlzaWJsZScp OworCisgIGFzeW5jX3Rlc3QoZnVuY3Rpb24odCkgeworICAgIHRhcmdldC5hZGRFdmVudExpc3Rl bmVyKCJmb2N1cyIsIHQuc3RlcF9mdW5jKGZ1bmN0aW9uKCkgeworICAgICAgYXNzZXJ0X2VxdWFs cyhnZXRDb21wdXRlZFN0eWxlKHRhcmdldCkub3V0bGluZVN0eWxlLCAic29saWQiLCBgb3V0bGlu ZS1zdHlsZSBmb3IgJHt0YXJnZXQudGFnTmFtZX0jJHt0YXJnZXQuaWR9IHNob3VsZCBiZSBzb2xp ZGApOworICAgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxlKHRhcmdldCkub3V0bGlu ZUNvbG9yLCAicmdiKDAsIDEyOCwgMCkiLCBgb3V0bGluZUNvbG9yIGZvciAke3RhcmdldC50YWdO YW1lfSMke3RhcmdldC5pZH0gc2hvdWxkIGJlIGdyZWVuYCk7CisgICAgICB0YXJnZXQuYmx1cigp OworICAgIH0pKTsKKyAgICB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigiYmx1ciIsIHQuc3RlcF9m dW5jKGZ1bmN0aW9uKCkgeworICAgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxlKHRh cmdldCkub3V0bGluZVN0eWxlLCAibm9uZSIsIGBvdXRsaW5lLXN0eWxlIGZvciAke3RhcmdldC50 YWdOYW1lfSMke3RhcmdldC5pZH0gc2hvdWxkIGJlIG5vbmVgKTsKKyAgICAgIHQuZG9uZSgpOwor ICAgIH0pKTsKKyAgICB0YXJnZXQuZm9jdXMoKTsKKyAgfSwgIjpmb2N1cy12aXNpYmxlIHN0b3Ag bWF0Y2hpbmcgYWZ0ZXIgYmx1ciIpOworPC9zY3JpcHQ+CisK 445671 2021-12-01 22:02:24 -0800 2021-12-02 00:06:33 -0800 Patch bug-233688-20211202070223.patch text/plain 8248 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Mjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWM3ZGEyZDg2MTA3NWE4 NDJkMTA3YjE1NzM0NDJlODdlNDZjNTAxZi4uNzFiNWRhZmQ5YTFmOWVkMzg3ZjdjM2NjM2Q1OWZh ZWJlMTIzZmQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTAxICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtzZWxlY3Rv cnNdIDpmb2N1cy12aXNpYmxlIHNob3VsZCBzdG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzY4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgUHNldWRvQ2xh c3NDaGFuZ2VJbnZhbGlkYXRpb24gZm9yIDpmb2N1cy12aXNpYmxlIHRvZ2V0aGVyIHdpdGggdGhl IG9uZSBmb3IgOmZvY3VzLAorICAgICAgICBhcyB3ZSBuZWVkIHRvIGtlZXAgYm90aCBmbGFncyBp biBzeW5jIHdoZW4gY29tcHV0aW5nIHRoZSBpbnZhbGlkYXRpb25zCisgICAgICAgIChpdCdzIG5v dCBwb3NzaWJsZSB0byBoYXZlIGFuIGVsZW1lbnQgdGhhdCBtYXRjaGVzIDpmb2N1cy12aXNpYmxl IGJ1dCBub3QgOmZvY3VzLAorICAgICAgICBhbmQgdGhhdCB3YXMgaGFwcGVuaW5nIGJlZm9yZSB0 aGlzIGNoYW5nZSkuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwKKworICAgICAgICAqIGRv bS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldEZvY3VzKTogQWRk IFBzZXVkb0NsYXNzQ2hhbmdlSW52YWxpZGF0aW9uIGZvciA6Zm9jdXMtdmlzaWJsZSBjaGFuZ2Us CisgICAgICAgIGFuZCBwdXQgaXQgaW4gdGhlIHNhbWUgc2NvcGUgYXMgdGhlIGZsYWdzIGNoYW5n ZXMuCisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzZXRIYXNGb2N1c1Zpc2libGUpOiBSZW1v dmUgUHNldWRvQ2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24gZnJvbSB0aGlzIG1ldGhvZC4KKyAgICAg ICAgKiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRs ZXI6OmludGVybmFsS2V5RXZlbnQpOiBVc2UgUHNldWRvQ2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24g Zm9yIDpmb2N1cy12aXNpYmxlIGNoYW5nZS4KKwogMjAyMS0xMS0zMCAgU2FpZCBBYm91LUhhbGxh d2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIENhbGN1bGF0ZSB0 aGUgcmVzdWx0IGltYWdlIHJlY3RhbmdsZSBvZiB0aGUgRmlsdGVyRWZmZWN0IGluIGZpbHRlciBj b29yZGluYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDk4NDIxZjQzMDAzM2I3OTJjN2Uy NzM1ZTYwNTAxNTE3MjJjMGUyNjMuLjY1NGMzNmVkOWQwNGYzNWMxNjE4YTkyNzAzYmZjZmYwMzRl ZmNlZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTgxNSwyMCArODE1LDIxIEBAIHZvaWQg RWxlbWVudDo6c2V0Rm9jdXMoYm9vbCBmbGFnLCBGb2N1c1Zpc2liaWxpdHkgdmlzaWJpbGl0eSkK ICAgICAgICAgcmV0dXJuOwogICAgIHsKICAgICAgICAgU3R5bGU6OlBzZXVkb0NsYXNzQ2hhbmdl SW52YWxpZGF0aW9uIGZvY3VzU3R5bGVJbnZhbGlkYXRpb24oKnRoaXMsIENTU1NlbGVjdG9yOjpQ c2V1ZG9DbGFzc0ZvY3VzKTsKKyAgICAgICAgU3R5bGU6OlBzZXVkb0NsYXNzQ2hhbmdlSW52YWxp ZGF0aW9uIGZvY3VzVmlzaWJsZVN0eWxlSW52YWxpZGF0aW9uKCp0aGlzLCBDU1NTZWxlY3Rvcjo6 UHNldWRvQ2xhc3NGb2N1c1Zpc2libGUpOwogICAgICAgICBTdHlsZTo6UHNldWRvQ2xhc3NDaGFu Z2VJbnZhbGlkYXRpb24gZGlyZWN0Rm9jdXNTdHlsZUludmFsaWRhdGlvbigqdGhpcywgQ1NTU2Vs ZWN0b3I6OlBzZXVkb0NsYXNzRGlyZWN0Rm9jdXMpOwogICAgICAgICBkb2N1bWVudCgpLnVzZXJB Y3Rpb25FbGVtZW50cygpLnNldEZvY3VzZWQoKnRoaXMsIGZsYWcpOwotICAgIH0KIAotICAgIC8v IFNoYWRvdyBob3N0IHdpdGggYSBzbG90IHRoYXQgY29udGFpbiBmb2N1c2VkIGVsZW1lbnQgaXMg bm90IGNvbnNpZGVyZWQgZm9jdXNlZC4KLSAgICBmb3IgKGF1dG8qIHJvb3QgPSBjb250YWluaW5n U2hhZG93Um9vdCgpOyByb290OyByb290ID0gcm9vdC0+aG9zdCgpLT5jb250YWluaW5nU2hhZG93 Um9vdCgpKSB7Ci0gICAgICAgIHJvb3QtPnNldENvbnRhaW5zRm9jdXNlZEVsZW1lbnQoZmxhZyk7 Ci0gICAgICAgIHJvb3QtPmhvc3QoKS0+aW52YWxpZGF0ZVN0eWxlKCk7Ci0gICAgfQorICAgICAg ICAvLyBTaGFkb3cgaG9zdCB3aXRoIGEgc2xvdCB0aGF0IGNvbnRhaW4gZm9jdXNlZCBlbGVtZW50 IGlzIG5vdCBjb25zaWRlcmVkIGZvY3VzZWQuCisgICAgICAgIGZvciAoYXV0byogcm9vdCA9IGNv bnRhaW5pbmdTaGFkb3dSb290KCk7IHJvb3Q7IHJvb3QgPSByb290LT5ob3N0KCktPmNvbnRhaW5p bmdTaGFkb3dSb290KCkpIHsKKyAgICAgICAgICAgIHJvb3QtPnNldENvbnRhaW5zRm9jdXNlZEVs ZW1lbnQoZmxhZyk7CisgICAgICAgICAgICByb290LT5ob3N0KCktPmludmFsaWRhdGVTdHlsZSgp OworICAgICAgICB9CiAKLSAgICBmb3IgKGF1dG8qIGVsZW1lbnQgPSB0aGlzOyBlbGVtZW50OyBl bGVtZW50ID0gZWxlbWVudC0+cGFyZW50RWxlbWVudEluQ29tcG9zZWRUcmVlKCkpCi0gICAgICAg IGVsZW1lbnQtPnNldEhhc0ZvY3VzV2l0aGluKGZsYWcpOworICAgICAgICBmb3IgKGF1dG8qIGVs ZW1lbnQgPSB0aGlzOyBlbGVtZW50OyBlbGVtZW50ID0gZWxlbWVudC0+cGFyZW50RWxlbWVudElu Q29tcG9zZWRUcmVlKCkpCisgICAgICAgICAgICBlbGVtZW50LT5zZXRIYXNGb2N1c1dpdGhpbihm bGFnKTsKIAotICAgIHNldEhhc0ZvY3VzVmlzaWJsZShmbGFnICYmICh2aXNpYmlsaXR5ID09IEZv Y3VzVmlzaWJpbGl0eTo6VmlzaWJsZSB8fCBzaG91bGRBbHdheXNIYXZlRm9jdXNWaXNpYmxlV2hl bkZvY3VzZWQoKnRoaXMpKSk7CisgICAgICAgIHNldEhhc0ZvY3VzVmlzaWJsZShmbGFnICYmICh2 aXNpYmlsaXR5ID09IEZvY3VzVmlzaWJpbGl0eTo6VmlzaWJsZSB8fCBzaG91bGRBbHdheXNIYXZl Rm9jdXNWaXNpYmxlV2hlbkZvY3VzZWQoKnRoaXMpKSk7CisgICAgfQogfQogCiB2b2lkIEVsZW1l bnQ6OnNldEhhc0ZvY3VzVmlzaWJsZShib29sIGZsYWcpCkBAIC04NDQsNyArODQ1LDYgQEAgdm9p ZCBFbGVtZW50OjpzZXRIYXNGb2N1c1Zpc2libGUoYm9vbCBmbGFnKQogICAgIGlmIChoYXNGb2N1 c1Zpc2libGUoKSA9PSBmbGFnKQogICAgICAgICByZXR1cm47CiAKLSAgICBTdHlsZTo6UHNldWRv Q2xhc3NDaGFuZ2VJbnZhbGlkYXRpb24gc3R5bGVJbnZhbGlkYXRpb24oKnRoaXMsIENTU1NlbGVj dG9yOjpQc2V1ZG9DbGFzc0ZvY3VzVmlzaWJsZSk7CiAgICAgZG9jdW1lbnQoKS51c2VyQWN0aW9u RWxlbWVudHMoKS5zZXRIYXNGb2N1c1Zpc2libGUoKnRoaXMsIGZsYWcpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggZWMzZTQyMGU3OWJiMWI1ZGNmNzAxMzU1ZDFh Y2U2OWJmODg2NDE1MS4uNjU5ZTNkMjYwYjlkMzQ1MjU4ODFlNjRmZTIyZTgzYjg1ODRhYjhjZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtODUsNiArODUsNyBAQAogI2lu Y2x1ZGUgIlBsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxF dmVudC5oIgogI2luY2x1ZGUgIlBsdWdpbkRvY3VtZW50LmgiCisjaW5jbHVkZSAiUHNldWRvQ2xh c3NDaGFuZ2VJbnZhbGlkYXRpb24uaCIKICNpbmNsdWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlJl bmRlckZyYW1lU2V0LmgiCiAjaW5jbHVkZSAiUmVuZGVySW1hZ2UuaCIKQEAgLTM2MzEsOCArMzYz MiwxMCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aW50ZXJuYWxLZXlFdmVudChjb25zdCBQbGF0Zm9y bUtleWJvYXJkRXZlbnQmIGluaXRpYWxLZXlFdmVudAogICAgICAgICAvLyBKdXN0IHR5cGluZyBh IG1vZGlmaWVyIGtleSBpcyBub3QgY29uc2lkZXJlZCB1c2VyIGludGVyYWN0aW9uIHdpdGggdGhl IHBhZ2UsIGJ1dCBTaGlmdCArIGEgKG9yIENhcHMgTG9jayArIGEpIGlzIGNvbnNpZGVyZWQgYW4g aW50ZXJhY3Rpb24uCiAgICAgICAgIGJvb2wgdXNlckhhc0ludGVyYWN0ZWRWaWFLZXl3b3JkID0g a2V5ZG93bi0+bW9kaWZpZXJLZXlzKCkuaXNFbXB0eSgpIHx8ICgoa2V5ZG93bi0+c2hpZnRLZXko KSB8fCBrZXlkb3duLT5jYXBzTG9ja0tleSgpKSAmJiAhaW5pdGlhbEtleUV2ZW50LnRleHQoKS5p c0VtcHR5KCkpOwogCi0gICAgICAgIGlmIChlbGVtZW50LmZvY3VzZWQoKSAmJiB1c2VySGFzSW50 ZXJhY3RlZFZpYUtleXdvcmQpCisgICAgICAgIGlmIChlbGVtZW50LmZvY3VzZWQoKSAmJiB1c2Vy SGFzSW50ZXJhY3RlZFZpYUtleXdvcmQpIHsKKyAgICAgICAgICAgIFN0eWxlOjpQc2V1ZG9DbGFz c0NoYW5nZUludmFsaWRhdGlvbiBmb2N1c1Zpc2libGVTdHlsZUludmFsaWRhdGlvbihlbGVtZW50 LCBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NGb2N1c1Zpc2libGUpOwogICAgICAgICAgICAgZWxl bWVudC5zZXRIYXNGb2N1c1Zpc2libGUodHJ1ZSk7CisgICAgICAgIH0KICAgICB9OwogICAgIHNl dEhhc0ZvY3VzVmlzaWJsZUlmTmVlZGVkKCplbGVtZW50KTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKaW5kZXggNmU3Y2I4NmY3ODAwMmEzNjYwMmY3MDliMzE1NDQ0YThhMDQ3YTYzYy4u ZTU1MTQ0Mjc2Zjg3NDY0YmVjZWY2MGQ3ZmJhNGJmNDg3NTNhZDNjOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTItMDEgIE1hbnVlbCBSZWdv IENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CisKKyAgICAgICAgW3NlbGVjdG9yc10gOmZv Y3VzLXZpc2libGUgc2hvdWxkIHN0b3AgbWF0Y2hpbmcgYWZ0ZXIgYmx1cgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzNjg4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG5ldyB0ZXN0IHRvIGNoZWNr IHRoYXQgOmZvY3VzLXZpc2libGUgc3RvcCBtYXRjaGluZyBhZnRlciBibHVyLgorCisgICAgICAg ICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0wMjMtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3NlbGVj dG9ycy9mb2N1cy12aXNpYmxlLTAyMy5odG1sOiBBZGRlZC4KKwogMjAyMS0xMS0yOSAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBpbml0aWFsIGltcGxlbWVu dGF0aW9uIGZvciB0aGUgV2ViIExvY2sgQVBJCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9zZWxlY3RvcnMvZm9jdXMtdmlzaWJsZS0w MjMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi43MzUxMmNkYmQ0MzJlMWJiNzdmZjY5MzE5ODNmOGVjMTFiOWQxZDcyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv c2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAK K1RhcmdldAorCitQQVNTICI6Zm9jdXMtdmlzaWJsZSIgc2hvdWxkIGJlIGEgdmFsaWQgc2VsZWN0 b3IKK1BBU1MgOmZvY3VzLXZpc2libGUgc3RvcCBtYXRjaGluZyBhZnRlciBibHVyCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL3Nl bGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mvc2VsZWN0b3JzL2ZvY3VzLXZpc2libGUtMDIzLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uYTkwYmIwN2I3MjkzY2M3MDJiZmUxYzc2MjZmZTA3OGFiY2ZmYWYyOAotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL3NlbGVjdG9ycy9mb2N1cy12aXNpYmxlLTAyMy5odG1sCkBAIC0wLDAgKzEsMzMgQEAK KzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiIC8+Cis8dGl0bGU+Q1NTIFRl c3QgKFNlbGVjdG9ycyk6IEVsZW1lbnQgZG9lc24ndCBtYXRjaCA6Zm9jdXMtdmlzaWJsZWwgYWZ0 ZXIgYmx1cjwvdGl0bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1hbnVlbCBSZWdvIENh c2Fzbm92YXMiIGhyZWY9Im1haWx0bzpyZWdvQGlnYWxpYS5jb20iPgorPGxpbmsgcmVsPSJoZWxw IiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvc2VsZWN0b3JzLTQvI3RoZS1mb2N1cy12 aXNpYmxlLXBzZXVkbyIgLz4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpz Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0Lmpz Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvY3NzL3N1cHBvcnQvcGFyc2luZy10ZXN0Y29tbW9u LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKyAgOmZvY3VzLXZpc2libGUgeworICAgIG91dGxpbmU6 IGdyZWVuIHNvbGlkIDVweDsKKyAgfQorPC9zdHlsZT4KKworPGRpdiBpZD0idGFyZ2V0IiB0YWJp bmRleD0iMCI+VGFyZ2V0PC9kaXY+Cis8c2NyaXB0PgorICAvLyBDaGVjayB0aGF0IDpmb2N1cy12 aXNpYmxlIGlzIHN1cHBvcnRlZC4KKyAgdGVzdF92YWxpZF9zZWxlY3RvcignOmZvY3VzLXZpc2li bGUnKTsKKworICBhc3luY190ZXN0KGZ1bmN0aW9uKHQpIHsKKyAgICB0YXJnZXQuYWRkRXZlbnRM aXN0ZW5lcigiZm9jdXMiLCB0LnN0ZXBfZnVuYyhmdW5jdGlvbigpIHsKKyAgICAgIGFzc2VydF9l cXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLm91dGxpbmVTdHlsZSwgInNvbGlkIiwgYG91 dGxpbmUtc3R5bGUgZm9yICR7dGFyZ2V0LnRhZ05hbWV9IyR7dGFyZ2V0LmlkfSBzaG91bGQgYmUg c29saWRgKTsKKyAgICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLm91 dGxpbmVDb2xvciwgInJnYigwLCAxMjgsIDApIiwgYG91dGxpbmVDb2xvciBmb3IgJHt0YXJnZXQu dGFnTmFtZX0jJHt0YXJnZXQuaWR9IHNob3VsZCBiZSBncmVlbmApOworICAgICAgdGFyZ2V0LmJs dXIoKTsKKyAgICB9KSk7CisgICAgdGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoImJsdXIiLCB0LnN0 ZXBfZnVuYyhmdW5jdGlvbigpIHsKKyAgICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHls ZSh0YXJnZXQpLm91dGxpbmVTdHlsZSwgIm5vbmUiLCBgb3V0bGluZS1zdHlsZSBmb3IgJHt0YXJn ZXQudGFnTmFtZX0jJHt0YXJnZXQuaWR9IHNob3VsZCBiZSBub25lYCk7CisgICAgICB0LmRvbmUo KTsKKyAgICB9KSk7CisgICAgdGFyZ2V0LmZvY3VzKCk7CisgIH0sICI6Zm9jdXMtdmlzaWJsZSBz dG9wIG1hdGNoaW5nIGFmdGVyIGJsdXIiKTsKKzwvc2NyaXB0PgorCg==