257739 2023-06-05 20:05:27 -0700 AX: AXObjectCache::setIsolatedTreeFocusedObject should handle the same special cases as focusedObjectForPage. 2023-06-07 12:25:27 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white tyler_w webkit-bug-importer oldest_to_newest 1960001 0 andresg_22 2023-06-05 20:05:27 -0700 This is necessary to retrieve the focused object from the Isolated tree without hitting the main thread: https://bugs.webkit.org/show_bug.cgi?id=256761 1960002 1 webkit-bug-importer 2023-06-05 20:05:41 -0700 <rdar://problem/110292074> 1960005 2 466599 andresg_22 2023-06-05 20:16:06 -0700 Created attachment 466599 Patch 1960006 3 466599 tyler_w 2023-06-05 21:10:07 -0700 Comment on attachment 466599 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466599&action=review Nice! Two questions: 1. Do we need to re-compute setIsolatedTreeFocusedObject after aria-activedescendant changes? 2. Does this change make any new tests pass? If not, I bet we could craft one based on aria-activedescendant that would not have passed in ITM before your change. > Source/WebCore/accessibility/AXObjectCache.cpp:485 > + return focusedObjectForNode(static_cast<Node*>(document)); I know this static_cast existed before your patch, but is it necessary? Document subclasses ContainerNode, which in turn subclasses Node, so we shouldn't need to cast, right? 1960113 4 466604 andresg_22 2023-06-06 13:19:00 -0700 Created attachment 466604 Patch 1960115 5 466604 cfleizach 2023-06-06 13:21:41 -0700 Comment on attachment 466604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466604&action=review > Source/WebCore/accessibility/AXObjectCache.cpp:-498 > - if (focus->accessibilityIsIgnored()) Do we still need this? What if the focused element is ignored? 1960119 6 andresg_22 2023-06-06 13:28:24 -0700 (In reply to chris fleizach from comment #5) > Comment on attachment 466604 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=466604&action=review > > > Source/WebCore/accessibility/AXObjectCache.cpp:-498 > > - if (focus->accessibilityIsIgnored()) > > Do we still need this? What if the focused element is ignored? No, we decided that if it is focused cannot be ignored. 1960137 7 466604 tyler_w 2023-06-06 14:26:04 -0700 Comment on attachment 466604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466604&action=review Thanks for doing this! > LayoutTests/accessibility/active-descendant-changes-result-in-focus-changes.html:23 > + await waitFor(() => accessibilityController.focusedElement.domIdentifier == "listbox"); > + output += expect("accessibilityController.focusedElement.domIdentifier", "'listbox'"); Nit for future patches, not worth changing for this one. This can be written more succinctly using expectAsync. output += await expectAsync("accessibilityController.focusedElement.domIdentifier", "'listbox'"); 1960187 8 466609 andresg_22 2023-06-06 19:07:41 -0700 Created attachment 466609 Patch 1960216 9 466609 tyler_w 2023-06-06 23:08:18 -0700 Comment on attachment 466609 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466609&action=review > Source/WebCore/accessibility/AXObjectCache.h:526 > + AccessibilityObject* focusedObjectForNode(Node*); Something I just remembered — I think we need to add a no-op stub for this in the #if !ENABLE(ACCESSIBILITY) part of this file. Otherwise we'll break the Playstation build. 1960274 10 466615 andresg_22 2023-06-07 06:02:33 -0700 Created attachment 466615 Patch Reverting change to form-control-value-settable.html because it doesn't help with GTK failure. 1960384 11 ews-feeder 2023-06-07 12:25:25 -0700 Committed 264952@main (b4bbe36cdab2): <https://commits.webkit.org/264952@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466615. 466599 2023-06-05 20:16:06 -0700 2023-06-06 13:18:58 -0700 Patch bug-257739-20230605231605.patch text/plain 4557 andresg_22 RnJvbSBlNDdiNzVmOGVmMmNiNGJlOWJlNDljNWI2MTc4YjY1YjRkYzE0NDRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBNb24sIDUgSnVuIDIwMjMgMjI6MjM6MzAgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WDogQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdCBzaG91bGQgaGFu ZGxlCiB0aGUgc2FtZSBzcGVjaWFsIGNhc2VzIGFzIGZvY3VzZWRPYmplY3RGb3JQYWdlLgogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzczOSA8cmRhcjovL3Byb2Js ZW0vMTEwMjkyMDc0PgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBZGRlZCBBWE9iamVj dENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZSB0byBoYW5kbGUgdGhlIHNwZWNpYWwgY2FzZXMg Zm9yIGJvdGggZm9jdXNlZE9iamVjdEZvclBhZ2UgYW5kIHNldElzb2xhdGVkVHJlZUZvY3VzZWRP YmplY3QuIFRoaXMgbWFrZXMgZ2V0dGluZyB0aGUgZm9jdXNlZCBvYmplY3QgbW9yZSBjb25zaXN0 ZW50IGJldHdlZW4gSVRNIG9uIGFuZCBvZmYuIEl0IHdpbGwgYWxzbyBhbGxvdyB0byBnZXQgdGhl IGZvY3VzZWQgT2JqZWN0IGZyb20gdGhlIElzb2xhdGVkIHRyZWUgd2l0aG91dCBoaXR0aW5nIHRo ZSBtYWluIHRocmVhZC4KCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcDoKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JQYWdlKToK KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JOb2RlKToKKFdlYkNvcmU6 OkFYT2JqZWN0Q2FjaGU6OnNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QpOgooV2ViQ29yZTo6 QVhPYmplY3RDYWNoZTo6aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOgoqIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oOgotLS0KIC4uLi9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8IDMxICsrKysrKysrKy0tLS0tLS0tLS0K IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oICB8ICAzICsrCiAy IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGIzYWMw NjQxZDM4NS4uNzdjMjNiMjBkNDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTQ4MCwyNCArNDgwLDI0IEBAIEFjY2Vzc2liaWxpdHlP YmplY3QqIEFYT2JqZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JQYWdlKGNvbnN0IFBhZ2UqIHBh Z2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgZG9jdW1lbnQtPnVwZGF0ZVN0eWxl SWZOZWVkZWQoKTsKKyAgICBpZiAoYXV0byogZm9jdXNlZEVsZW1lbnQgPSBkb2N1bWVudC0+Zm9j dXNlZEVsZW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIGZvY3VzZWRPYmplY3RGb3JOb2RlKGZvY3Vz ZWRFbGVtZW50KTsKKyAgICByZXR1cm4gZm9jdXNlZE9iamVjdEZvck5vZGUoc3RhdGljX2Nhc3Q8 Tm9kZSo+KGRvY3VtZW50KSk7Cit9CiAKLSAgICBFbGVtZW50KiBmb2N1c2VkRWxlbWVudCA9IGRv Y3VtZW50LT5mb2N1c2VkRWxlbWVudCgpOwotICAgIGlmIChpczxIVE1MQXJlYUVsZW1lbnQ+KGZv Y3VzZWRFbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIGZvY3VzZWRJbWFnZU1hcFVJRWxlbWVudChk b3duY2FzdDxIVE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWRFbGVtZW50KSk7CitBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZShOb2RlKiBmb2N1c2Vk Tm9kZSkKK3sKKyAgICBpZiAoYXV0byogYXJlYSA9IGR5bmFtaWNEb3duY2FzdDxIVE1MQXJlYUVs ZW1lbnQ+KGZvY3VzZWROb2RlKSkKKyAgICAgICAgcmV0dXJuIGZvY3VzZWRJbWFnZU1hcFVJRWxl bWVudChhcmVhKTsKIAotICAgIGF1dG8qIGZvY3VzID0gZ2V0T3JDcmVhdGUoZm9jdXNlZEVsZW1l bnQgPyBmb2N1c2VkRWxlbWVudCA6IHN0YXRpY19jYXN0PE5vZGUqPihkb2N1bWVudCkpOworICAg IGF1dG8qIGZvY3VzID0gZ2V0T3JDcmVhdGUoZm9jdXNlZE5vZGUpOwogICAgIGlmICghZm9jdXMp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKGZvY3VzLT5zaG91bGRGb2N1c0Fj dGl2ZURlc2NlbmRhbnQoKSkgewogICAgICAgICBpZiAoYXV0byogZGVzY2VuZGFudCA9IGZvY3Vz LT5hY3RpdmVEZXNjZW5kYW50KCkpCi0gICAgICAgICAgICBmb2N1cyA9IGRlc2NlbmRhbnQ7Cisg ICAgICAgICAgICByZXR1cm4gZGVzY2VuZGFudDsKICAgICB9Ci0KLSAgICAvLyB0aGUgSFRNTCBl bGVtZW50LCBmb3IgZXhhbXBsZSwgaXMgZm9jdXNhYmxlIGJ1dCBoYXMgYW4gQVggb2JqZWN0IHRo YXQgaXMgaWdub3JlZAotICAgIGlmIChmb2N1cy0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKQot ICAgICAgICBmb2N1cyA9IGZvY3VzLT5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKLQogICAgIHJl dHVybiBmb2N1czsKIH0KIApAQCAtNTA4LDcgKzUwOCw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6 c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChOb2RlKiBmb2N1c2VkTm9kZSkKICAgICBpZiAo IW1fcGFnZUlEKQogICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvKiBmb2N1cyA9IGdldE9yQ3Jl YXRlKGZvY3VzZWROb2RlKTsKKyAgICBhdXRvKiBmb2N1cyA9IGZvY3VzZWRPYmplY3RGb3JOb2Rl KGZvY3VzZWROb2RlKTsKIAogICAgIGlmIChhdXRvIHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6dHJl ZUZvclBhZ2VJRCgqbV9wYWdlSUQpKQogICAgICAgICB0cmVlLT5zZXRGb2N1c2VkTm9kZUlEKGZv Y3VzID8gZm9jdXMtPm9iamVjdElEKCkgOiBBWElEKCkpOwpAQCAtMTQ5NiwxNiArMTQ5NiwxNSBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmRlZmVyTW9kYWxDaGFuZ2UoRWxlbWVudCogZWxlbWVudCkK ICAgICBpZiAoIW1fcGVyZm9ybUNhY2hlVXBkYXRlVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAg bV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKIH0KLSAgICAKKwog dm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZChOb2RlKiBv bGROb2RlLCBOb2RlKiBuZXdOb2RlLCBVcGRhdGVNb2RhbCB1cGRhdGVNb2RhbCkKIHsKLSNpZiBF TkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQotICAgIHNldElzb2xhdGVkVHJlZUZv Y3VzZWRPYmplY3QobmV3Tm9kZSk7Ci0jZW5kaWYKLQogICAgIGlmICh1cGRhdGVNb2RhbCA9PSBV cGRhdGVNb2RhbDo6WWVzKQogICAgICAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7CiAgICAg aGFuZGxlTWVudUl0ZW1TZWxlY3RlZChuZXdOb2RlKTsKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElU WV9JU09MQVRFRF9UUkVFKQorICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QobmV3Tm9k ZSk7CisjZW5kaWYKICAgICBwbGF0Zm9ybUhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKG9s ZE5vZGUsIG5ld05vZGUpOwogfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuaAppbmRleCA5YjJjYWY5ZTA4N2QuLjRmMWRiOWM4NTA0ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTUxNiw2ICs1 MTYsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBzaG91bGRTa2lwQm91bmRhcnkoY29uc3QgQ2hh cmFjdGVyT2Zmc2V0JiwgY29uc3QgQ2hhcmFjdGVyT2Zmc2V0Jik7CiBwcml2YXRlOgogICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIHJvb3RXZWJBcmVhKCk7CisKKyAgICAvLyBUaGUgQVggZm9jdXMg aXMgbW9yZSBmaW5lZ3JhaW5lZCB0aGFuIHRoZSBub3Rpb24gb2YgZm9jdXNlZCBOb2RlLiBUaGlz IG1ldGhvZCBoYW5kbGVzIHRob3NlIGNhc2VzIHdoZXJlIHRoZSBmb2N1c2VkIEFYIG9iamVjdCBp cyBhIGRlc2NlbmRhbnQgb3IgYSBzdWItcGFydCBvZiB0aGUgZm9jdXNlZCBOb2RlLgorICAgIEFj Y2Vzc2liaWxpdHlPYmplY3QqIGZvY3VzZWRPYmplY3RGb3JOb2RlKE5vZGUqKTsKICAgICBzdGF0 aWMgQWNjZXNzaWJpbGl0eU9iamVjdCogZm9jdXNlZEltYWdlTWFwVUlFbGVtZW50KEhUTUxBcmVh RWxlbWVudCopOwogCiAgICAgQVhJRCBnZXRBWElEKEFjY2Vzc2liaWxpdHlPYmplY3QqKTsK 466604 2023-06-06 13:19:00 -0700 2023-06-06 19:07:39 -0700 Patch bug-257739-20230606161859.patch text/plain 9493 andresg_22 RnJvbSBlMjliYTg2OTI4YWIzOGE5N2QzNjU1YjdhYWJhZWIwMmVlMDFjZTJjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBNb24sIDUgSnVuIDIwMjMgMjI6MjM6MzAgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WDogQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdCBzaG91bGQgaGFu ZGxlCiB0aGUgc2FtZSBzcGVjaWFsIGNhc2VzIGFzIGZvY3VzZWRPYmplY3RGb3JQYWdlLgogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzczOSA8cmRhcjovL3Byb2Js ZW0vMTEwMjkyMDc0PgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBZGRlZCBBWE9iamVj dENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZSB0byBoYW5kbGUgdGhlIHNwZWNpYWwgY2FzZXMg Zm9yIGJvdGggZm9jdXNlZE9iamVjdEZvclBhZ2UgYW5kIHNldElzb2xhdGVkVHJlZUZvY3VzZWRP YmplY3QuIFRoaXMgbWFrZXMgZ2V0dGluZyB0aGUgZm9jdXNlZCBvYmplY3QgbW9yZSBjb25zaXN0 ZW50IGJldHdlZW4gSVRNIG9uIGFuZCBvZmYuIEl0IHdpbGwgYWxzbyBhbGxvdyB0byBnZXQgdGhl IGZvY3VzZWQgT2JqZWN0IGZyb20gdGhlIElzb2xhdGVkIHRyZWUgd2l0aG91dCBoaXR0aW5nIHRo ZSBtYWluIHRocmVhZC4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2Vu ZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dDogQWRkZWQu CiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJl c3VsdC1pbi1mb2N1cy1jaGFuZ2VzLmh0bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpmb2N1 c2VkT2JqZWN0Rm9yUGFnZSk6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0 Rm9yTm9kZSk6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpzZXRJc29sYXRlZFRyZWVGb2N1c2Vk T2JqZWN0KToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmhhbmRsZUZvY3VzZWRVSUVsZW1lbnRD aGFuZ2VkKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRD aGFuZ2VkKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaDoK LS0tCiAuLi4vV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwICAgfCA0MCAr KysrKysrKy0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmggIHwgIDUgKystCiAuLi5hbmdlcy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy1leHBlY3Rl ZC50eHQgfCAxMSArKysrKwogLi4ubmRhbnQtY2hhbmdlcy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdl cy5odG1sIHwgNDMgKysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA3OCBpbnNl cnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2FjdGl2ZS1kZXNjZW5kYW50LWNoYW5nZXMtcmVzdWx0LWluLWZvY3Vz LWNoYW5nZXMtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFu Z2VzLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hl LmNwcAppbmRleCBiM2FjMDY0MWQzODUuLjk0MGE4ZjdlY2U5YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCkBAIC00ODAsMzYgKzQ4MCwzNCBA QCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yUGFn ZShjb25zdCBQYWdlKiBwYWdlKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGRvY3Vt ZW50LT51cGRhdGVTdHlsZUlmTmVlZGVkKCk7CisgICAgaWYgKGF1dG8qIGZvY3VzZWRFbGVtZW50 ID0gZG9jdW1lbnQtPmZvY3VzZWRFbGVtZW50KCkpCisgICAgICAgIHJldHVybiBmb2N1c2VkT2Jq ZWN0Rm9yTm9kZShmb2N1c2VkRWxlbWVudCk7CisgICAgcmV0dXJuIGZvY3VzZWRPYmplY3RGb3JO b2RlKGRvY3VtZW50KTsKK30KIAotICAgIEVsZW1lbnQqIGZvY3VzZWRFbGVtZW50ID0gZG9jdW1l bnQtPmZvY3VzZWRFbGVtZW50KCk7Ci0gICAgaWYgKGlzPEhUTUxBcmVhRWxlbWVudD4oZm9jdXNl ZEVsZW1lbnQpKQotICAgICAgICByZXR1cm4gZm9jdXNlZEltYWdlTWFwVUlFbGVtZW50KGRvd25j YXN0PEhUTUxBcmVhRWxlbWVudD4oZm9jdXNlZEVsZW1lbnQpKTsKK0FjY2Vzc2liaWxpdHlPYmpl Y3QqIEFYT2JqZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JOb2RlKE5vZGUqIGZvY3VzZWROb2Rl KQoreworICAgIGlmIChhdXRvKiBhcmVhID0gZHluYW1pY0Rvd25jYXN0PEhUTUxBcmVhRWxlbWVu dD4oZm9jdXNlZE5vZGUpKQorICAgICAgICByZXR1cm4gZm9jdXNlZEltYWdlTWFwVUlFbGVtZW50 KGFyZWEpOwogCi0gICAgYXV0byogZm9jdXMgPSBnZXRPckNyZWF0ZShmb2N1c2VkRWxlbWVudCA/ IGZvY3VzZWRFbGVtZW50IDogc3RhdGljX2Nhc3Q8Tm9kZSo+KGRvY3VtZW50KSk7CisgICAgYXV0 byogZm9jdXMgPSBnZXRPckNyZWF0ZShmb2N1c2VkTm9kZSk7CiAgICAgaWYgKCFmb2N1cykKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBpZiAoZm9jdXMtPnNob3VsZEZvY3VzQWN0aXZl RGVzY2VuZGFudCgpKSB7CiAgICAgICAgIGlmIChhdXRvKiBkZXNjZW5kYW50ID0gZm9jdXMtPmFj dGl2ZURlc2NlbmRhbnQoKSkKLSAgICAgICAgICAgIGZvY3VzID0gZGVzY2VuZGFudDsKKyAgICAg ICAgICAgIHJldHVybiBkZXNjZW5kYW50OwogICAgIH0KLQotICAgIC8vIHRoZSBIVE1MIGVsZW1l bnQsIGZvciBleGFtcGxlLCBpcyBmb2N1c2FibGUgYnV0IGhhcyBhbiBBWCBvYmplY3QgdGhhdCBp cyBpZ25vcmVkCi0gICAgaWYgKGZvY3VzLT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAg ICAgIGZvY3VzID0gZm9jdXMtPnBhcmVudE9iamVjdFVuaWdub3JlZCgpOwotCiAgICAgcmV0dXJu IGZvY3VzOwogfQogCiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKLXZv aWQgQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChOb2RlKiBmb2N1 c2VkTm9kZSkKK3ZvaWQgQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVj dChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1cykKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwogICAgIGlmICghbV9wYWdlSUQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8qIGZv Y3VzID0gZ2V0T3JDcmVhdGUoZm9jdXNlZE5vZGUpOwotCiAgICAgaWYgKGF1dG8gdHJlZSA9IEFY SXNvbGF0ZWRUcmVlOjp0cmVlRm9yUGFnZUlEKCptX3BhZ2VJRCkpCiAgICAgICAgIHRyZWUtPnNl dEZvY3VzZWROb2RlSUQoZm9jdXMgPyBmb2N1cy0+b2JqZWN0SUQoKSA6IEFYSUQoKSk7CiB9CkBA IC0xNDk2LDE2ICsxNDk0LDE1IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5n ZShFbGVtZW50KiBlbGVtZW50KQogICAgIGlmICghbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lci5p c0FjdGl2ZSgpKQogICAgICAgICBtX3BlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyLnN0YXJ0T25lU2hv dCgwX3MpOwogfQotICAgIAorCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUZvY3VzZWRVSUVs ZW1lbnRDaGFuZ2VkKE5vZGUqIG9sZE5vZGUsIE5vZGUqIG5ld05vZGUsIFVwZGF0ZU1vZGFsIHVw ZGF0ZU1vZGFsKQogewotI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCi0g ICAgc2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChuZXdOb2RlKTsKLSNlbmRpZgotCiAgICAg aWYgKHVwZGF0ZU1vZGFsID09IFVwZGF0ZU1vZGFsOjpZZXMpCiAgICAgICAgIHVwZGF0ZUN1cnJl bnRNb2RhbE5vZGUoKTsKICAgICBoYW5kbGVNZW51SXRlbVNlbGVjdGVkKG5ld05vZGUpOworI2lm IEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCisgICAgc2V0SXNvbGF0ZWRUcmVl Rm9jdXNlZE9iamVjdChmb2N1c2VkT2JqZWN0Rm9yTm9kZShuZXdOb2RlKSk7CisjZW5kaWYKICAg ICBwbGF0Zm9ybUhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKG9sZE5vZGUsIG5ld05vZGUp OwogfQogICAgIApAQCAtMjAzMiw5ICsyMDI5LDEyIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFu ZGxlQWN0aXZlRGVzY2VuZGFudENoYW5nZWQoRWxlbWVudCYgZWxlbWVudCkKIAogICAgIC8vIEhh bmRsZSBhY3RpdmUtZGVzY2VuZGFudCBjaGFuZ2VzIHdoZW4gdGhlIHRhcmdldCBhbGxvd3MgZm9y IGl0LCBvciB0aGUgY29udHJvbGxlZCBvYmplY3QgYWxsb3dzIGZvciBpdC4KICAgICBBY2Nlc3Np YmlsaXR5T2JqZWN0KiB0YXJnZXQgPSBudWxscHRyOwotICAgIGlmIChvYmplY3QtPnNob3VsZEZv Y3VzQWN0aXZlRGVzY2VuZGFudCgpKQorICAgIGlmIChvYmplY3QtPnNob3VsZEZvY3VzQWN0aXZl RGVzY2VuZGFudCgpKSB7CisjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkK KyAgICAgICAgc2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChhY3RpdmVEZXNjZW5kYW50KTsK KyNlbmRpZgogICAgICAgICB0YXJnZXQgPSBvYmplY3Q7Ci0gICAgZWxzZSBpZiAob2JqZWN0LT5p c0NvbWJvQm94KCkpIHsKKyAgICB9IGVsc2UgaWYgKG9iamVjdC0+aXNDb21ib0JveCgpKSB7CiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgICAgIC8vIElmIHRoZSBjb21ib2JveCdzIGFjdGl2ZURl c2NlbmRhbnQgaXMgaW5zaWRlIGEgZGVzY2VuZGFudCBvd25lZCBvciBjb250cm9sbGVkIGJ5IHRo ZSBjb21ib2JveCwgdGhhdCBkZXNjZW5kYW50IHNob3VsZCBiZSB0aGUgdGFyZ2V0IG9mIHRoZSBu b3RpZmljYXRpb24gYW5kIG5vdCB0aGUgY29tYm9ib3ggaXRzZWxmLgogICAgICAgICBpZiAoYXV0 byogb3duZWRPYmplY3QgPSBBY2Nlc3NpYmlsaXR5OjpmaW5kUmVsYXRlZE9iamVjdEluQW5jZXN0 cnkoKm9iamVjdCwgQVhSZWxhdGlvblR5cGU6Ok93bmVyRm9yLCAqYWN0aXZlRGVzY2VuZGFudCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCmluZGV4IDli MmNhZjllMDg3ZC4uNWU5ZDY4NWNmM2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYT2JqZWN0Q2FjaGUuaApAQCAtNDU2LDcgKzQ1Niw3IEBAIHByaXZhdGU6CiAgICAgQVhD b3JlT2JqZWN0KiBpc29sYXRlZFRyZWVSb290T2JqZWN0KCk7CiAgICAgLy8gUHJvcGFnYXRlcyB0 aGUgcm9vdCBvZiB0aGUgaXNvbGF0ZWQgdHJlZSBiYWNrIGludG8gdGhlIENvcmUgYW5kIFdlYktp dC4KICAgICB2b2lkIHNldElzb2xhdGVkVHJlZVJvb3QoQVhDb3JlT2JqZWN0Kik7Ci0gICAgdm9p ZCBzZXRJc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KE5vZGUqKTsKKyAgICB2b2lkIHNldElzb2xh dGVkVHJlZUZvY3VzZWRPYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCopOwogICAgIFJlZlB0cjxB WElzb2xhdGVkVHJlZT4gZ2V0T3JDcmVhdGVJc29sYXRlZFRyZWUoKTsKICAgICB2b2lkIGJ1aWxk SXNvbGF0ZWRUcmVlKCk7CiAgICAgdm9pZCB1cGRhdGVJc29sYXRlZFRyZWUoQWNjZXNzaWJpbGl0 eU9iamVjdCYsIEFYTm90aWZpY2F0aW9uKTsKQEAgLTUxNiw2ICs1MTYsOSBAQCBwcm90ZWN0ZWQ6 CiAgICAgYm9vbCBzaG91bGRTa2lwQm91bmRhcnkoY29uc3QgQ2hhcmFjdGVyT2Zmc2V0JiwgY29u c3QgQ2hhcmFjdGVyT2Zmc2V0Jik7CiBwcml2YXRlOgogICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IHJvb3RXZWJBcmVhKCk7CisKKyAgICAvLyBUaGUgQVggZm9jdXMgaXMgbW9yZSBmaW5lZ3JhaW5l ZCB0aGFuIHRoZSBub3Rpb24gb2YgZm9jdXNlZCBOb2RlLiBUaGlzIG1ldGhvZCBoYW5kbGVzIHRo b3NlIGNhc2VzIHdoZXJlIHRoZSBmb2N1c2VkIEFYIG9iamVjdCBpcyBhIGRlc2NlbmRhbnQgb3Ig YSBzdWItcGFydCBvZiB0aGUgZm9jdXNlZCBOb2RlLgorICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGZvY3VzZWRPYmplY3RGb3JOb2RlKE5vZGUqKTsKICAgICBzdGF0aWMgQWNjZXNzaWJpbGl0eU9i amVjdCogZm9jdXNlZEltYWdlTWFwVUlFbGVtZW50KEhUTUxBcmVhRWxlbWVudCopOwogCiAgICAg QVhJRCBnZXRBWElEKEFjY2Vzc2liaWxpdHlPYmplY3QqKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdlcy1yZXN1bHQtaW4tZm9j dXMtY2hhbmdlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FjdGl2 ZS1kZXNjZW5kYW50LWNoYW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uOGRhYTJmMTAwYTE1Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2Vu ZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDExIEBACitUZXN0cyB0aGF0IGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMgcmVzdWx0IGlu IGZvY3VzIGNoYW5nZXMuCisKK1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRF bGVtZW50LmRvbUlkZW50aWZpZXIgPT09ICdsaXN0Ym94JworUEFTUzogYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRpZmllciA9PT0gJ2l0ZW0xJworUEFTUzog YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRpZmllciA9PT0g J2l0ZW0yJworUEFTUzogYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9t SWRlbnRpZmllciA9PT0gJ2xpc3Rib3gnCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2FjdGl2ZS1kZXNjZW5kYW50LWNoYW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMuaHRt bCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdlcy1y ZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMC4uYWVmMDU4Y2VhN2I2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1j aGFuZ2VzLmh0bWwKQEAgLTAsMCArMSw0MyBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxo ZWFkPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvYWNjZXNzaWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHk+CisKKzxkaXYgaWQ9Imxpc3Rib3giIHJvbGU9Imxpc3Rib3giIHRh YmluZGV4PSIwIj4KKyAgICA8ZGl2IGlkPSJpdGVtMSIgcm9sZT0ibGlzdGl0ZW0iPjwvZGl2Pgor ICAgIDxkaXYgaWQ9Iml0ZW0yIiByb2xlPSJsaXN0aXRlbSI+PC9kaXY+Cis8L2Rpdj4KKworPHNj cmlwdD4KK2lmIChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgIHdpbmRvdy5qc1Rlc3RJ c0FzeW5jID0gdHJ1ZTsKKyAgICBsZXQgb3V0cHV0ID0gIlRlc3RzIHRoYXQgYWN0aXZlIGRlc2Nl bmRhbnQgY2hhbmdlcyByZXN1bHQgaW4gZm9jdXMgY2hhbmdlcy5cblxuIjsKKworICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJsaXN0Ym94IikuZm9jdXMoKTsKKyAgICBzZXRUaW1lb3V0KGFz eW5jICgpID0+IHsKKyAgICAgICAgdmFyIGxpc3Rib3ggPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxl ci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImxpc3Rib3giKTsKKyAgICAgICAgYXdhaXQgd2FpdEZv cigoKSA9PiBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlm aWVyID09ICJsaXN0Ym94Iik7CisgICAgICAgIG91dHB1dCArPSBleHBlY3QoImFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIiLCAiJ2xpc3Rib3gnIik7 CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImxpc3Rib3giKS5zZXRBdHRyaWJ1 dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIsICJpdGVtMSIpOworICAgICAgICBhd2FpdCB3YWl0 Rm9yKCgpID0+IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50 aWZpZXIgPT0gIml0ZW0xIik7CisgICAgICAgIG91dHB1dCArPSBleHBlY3QoImFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIiLCAiJ2l0ZW0xJyIpOwor CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsaXN0Ym94Iikuc2V0QXR0cmlidXRl KCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAiaXRlbTIiKTsKKyAgICAgICAgYXdhaXQgd2FpdEZv cigoKSA9PiBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlm aWVyID09ICJpdGVtMiIpOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJhY2Nlc3NpYmlsaXR5 Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVyIiwgIidpdGVtMiciKTsKKwor ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLnJlbW92ZUF0dHJpYnV0 ZSgiYXJpYS1hY3RpdmVkZXNjZW5kYW50Iik7CisgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRpZmllciA9PSAi bGlzdGJveCIpOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJhY2Nlc3NpYmlsaXR5Q29udHJv bGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVyIiwgIidsaXN0Ym94JyIpOworCisgICAg ICAgIGRlYnVnKG91dHB1dCk7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH0sIDApOwor fQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 466609 2023-06-06 19:07:41 -0700 2023-06-07 06:02:31 -0700 Patch bug-257739-20230606220740.patch text/plain 10083 andresg_22 RnJvbSAyZDJlOWFjZjZmODUyY2ZhOTQwOTY0YzY2YjlmMDg3NGUzZTcwOGQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBNb24sIDUgSnVuIDIwMjMgMjI6MjM6MzAgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WDogQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdCBzaG91bGQgaGFu ZGxlCiB0aGUgc2FtZSBzcGVjaWFsIGNhc2VzIGFzIGZvY3VzZWRPYmplY3RGb3JQYWdlLgogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzczOSA8cmRhcjovL3Byb2Js ZW0vMTEwMjkyMDc0PgoKUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2ggYW5kIFR5bGVyIFdpbGNv Y2suCgpBZGRlZCBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZSB0byBoYW5kbGUg dGhlIHNwZWNpYWwgY2FzZXMgZm9yIGJvdGggZm9jdXNlZE9iamVjdEZvclBhZ2UgYW5kIHNldElz b2xhdGVkVHJlZUZvY3VzZWRPYmplY3QuIFRoaXMgbWFrZXMgZ2V0dGluZyB0aGUgZm9jdXNlZCBv YmplY3QgbW9yZSBjb25zaXN0ZW50IGJldHdlZW4gSVRNIG9uIGFuZCBvZmYuIEl0IHdpbGwgYWxz byBhbGxvdyB0byBnZXQgdGhlIGZvY3VzZWQgT2JqZWN0IGZyb20gdGhlIElzb2xhdGVkIHRyZWUg d2l0aG91dCBoaXR0aW5nIHRoZSBtYWluIHRocmVhZC4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4 cGVjdGVkLnR4dDogQWRkZWQuCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVz Y2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLmh0bWw6IEFkZGVkLgoqIExh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZm9ybS1jb250cm9sLXZhbHVlLXNldHRhYmxlLmh0bWw6 CiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcDoKKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JQYWdlKToKKFdlYkNvcmU6OkFYT2Jq ZWN0Q2FjaGU6OmZvY3VzZWRPYmplY3RGb3JOb2RlKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6 OnNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QpOgooV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6 aGFuZGxlRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOgooV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6 aGFuZGxlQWN0aXZlRGVzY2VuZGFudENoYW5nZWQpOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5oOgotLS0KIC4uLi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5jcHAgICB8IDQwICsrKysrKysrKy0tLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oICB8ICA1ICsrLQogLi4uYW5nZXMtcmVzdWx0 LWluLWZvY3VzLWNoYW5nZXMtZXhwZWN0ZWQudHh0IHwgMTEgKysrKysKIC4uLm5kYW50LWNoYW5n ZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMuaHRtbCB8IDM5ICsrKysrKysrKysrKysrKysrKwog Li4uL2Zvcm0tY29udHJvbC12YWx1ZS1zZXR0YWJsZS5odG1sICAgICAgICAgIHwgIDIgKy0KIDUg ZmlsZXMgY2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCiBjcmVhdGUg bW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1j aGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUg MTAwNjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdl cy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy5odG1sCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggYWQ2NjM4OGE4MzQ1Li4wYWFhNzAwZTMx NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNw cApAQCAtNDgwLDM2ICs0ODAsMzQgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQVhPYmplY3RDYWNo ZTo6Zm9jdXNlZE9iamVjdEZvclBhZ2UoY29uc3QgUGFnZSogcGFnZSkKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAKICAgICBkb2N1bWVudC0+dXBkYXRlU3R5bGVJZk5lZWRlZCgpOworICAgIGlm IChhdXRvKiBmb2N1c2VkRWxlbWVudCA9IGRvY3VtZW50LT5mb2N1c2VkRWxlbWVudCgpKQorICAg ICAgICByZXR1cm4gZm9jdXNlZE9iamVjdEZvck5vZGUoZm9jdXNlZEVsZW1lbnQpOworICAgIHJl dHVybiBmb2N1c2VkT2JqZWN0Rm9yTm9kZShkb2N1bWVudCk7Cit9CiAKLSAgICBFbGVtZW50KiBm b2N1c2VkRWxlbWVudCA9IGRvY3VtZW50LT5mb2N1c2VkRWxlbWVudCgpOwotICAgIGlmIChpczxI VE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWRFbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIGZvY3VzZWRJ bWFnZU1hcFVJRWxlbWVudChkb3duY2FzdDxIVE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWRFbGVtZW50 KSk7CitBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9y Tm9kZShOb2RlKiBmb2N1c2VkTm9kZSkKK3sKKyAgICBpZiAoYXV0byogYXJlYSA9IGR5bmFtaWNE b3duY2FzdDxIVE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWROb2RlKSkKKyAgICAgICAgcmV0dXJuIGZv Y3VzZWRJbWFnZU1hcFVJRWxlbWVudChhcmVhKTsKIAotICAgIGF1dG8qIGZvY3VzID0gZ2V0T3JD cmVhdGUoZm9jdXNlZEVsZW1lbnQgPyBmb2N1c2VkRWxlbWVudCA6IHN0YXRpY19jYXN0PE5vZGUq Pihkb2N1bWVudCkpOworICAgIGF1dG8qIGZvY3VzID0gZ2V0T3JDcmVhdGUoZm9jdXNlZE5vZGUp OwogICAgIGlmICghZm9jdXMpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKGZv Y3VzLT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkgewogICAgICAgICBpZiAoYXV0byog ZGVzY2VuZGFudCA9IGZvY3VzLT5hY3RpdmVEZXNjZW5kYW50KCkpCi0gICAgICAgICAgICBmb2N1 cyA9IGRlc2NlbmRhbnQ7CisgICAgICAgICAgICByZXR1cm4gZGVzY2VuZGFudDsKICAgICB9Ci0K LSAgICAvLyB0aGUgSFRNTCBlbGVtZW50LCBmb3IgZXhhbXBsZSwgaXMgZm9jdXNhYmxlIGJ1dCBo YXMgYW4gQVggb2JqZWN0IHRoYXQgaXMgaWdub3JlZAotICAgIGlmIChmb2N1cy0+YWNjZXNzaWJp bGl0eUlzSWdub3JlZCgpKQotICAgICAgICBmb2N1cyA9IGZvY3VzLT5wYXJlbnRPYmplY3RVbmln bm9yZWQoKTsKLQogICAgIHJldHVybiBmb2N1czsKIH0KIAogI2lmIEVOQUJMRShBQ0NFU1NJQklM SVRZX0lTT0xBVEVEX1RSRUUpCi12b2lkIEFYT2JqZWN0Q2FjaGU6OnNldElzb2xhdGVkVHJlZUZv Y3VzZWRPYmplY3QoTm9kZSogZm9jdXNlZE5vZGUpCit2b2lkIEFYT2JqZWN0Q2FjaGU6OnNldElz b2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCogZm9jdXMpCiB7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBpZiAoIW1fcGFnZUlEKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBhdXRvKiBmb2N1cyA9IGdldE9yQ3JlYXRlKGZvY3VzZWROb2RlKTsKLQog ICAgIGlmIChhdXRvIHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdl SUQpKQogICAgICAgICB0cmVlLT5zZXRGb2N1c2VkTm9kZUlEKGZvY3VzID8gZm9jdXMtPm9iamVj dElEKCkgOiBBWElEKCkpOwogfQpAQCAtMTUwMSwxNiArMTQ5OSwxNSBAQCB2b2lkIEFYT2JqZWN0 Q2FjaGU6OmRlZmVyTW9kYWxDaGFuZ2UoRWxlbWVudCogZWxlbWVudCkKICAgICBpZiAoIW1fcGVy Zm9ybUNhY2hlVXBkYXRlVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9wZXJmb3JtQ2FjaGVV cGRhdGVUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKIH0KLSAgICAKKwogdm9pZCBBWE9iamVjdENh Y2hlOjpoYW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZChOb2RlKiBvbGROb2RlLCBOb2RlKiBu ZXdOb2RlLCBVcGRhdGVNb2RhbCB1cGRhdGVNb2RhbCkKIHsKLSNpZiBFTkFCTEUoQUNDRVNTSUJJ TElUWV9JU09MQVRFRF9UUkVFKQotICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QobmV3 Tm9kZSk7Ci0jZW5kaWYKLQogICAgIGlmICh1cGRhdGVNb2RhbCA9PSBVcGRhdGVNb2RhbDo6WWVz KQogICAgICAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7CiAgICAgaGFuZGxlTWVudUl0ZW1T ZWxlY3RlZChuZXdOb2RlKTsKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVF KQorICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoZm9jdXNlZE9iamVjdEZvck5vZGUo bmV3Tm9kZSkpOworI2VuZGlmCiAgICAgcGxhdGZvcm1IYW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hh bmdlZChvbGROb2RlLCBuZXdOb2RlKTsKIH0KICAgICAKQEAgLTIwNDgsOSArMjA0NSwxMiBAQCB2 b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKEVsZW1lbnQm IGVsZW1lbnQpCiAKICAgICAvLyBIYW5kbGUgYWN0aXZlLWRlc2NlbmRhbnQgY2hhbmdlcyB3aGVu IHRoZSB0YXJnZXQgYWxsb3dzIGZvciBpdCwgb3IgdGhlIGNvbnRyb2xsZWQgb2JqZWN0IGFsbG93 cyBmb3IgaXQuCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogdGFyZ2V0ID0gbnVsbHB0cjsKLSAg ICBpZiAob2JqZWN0LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkKKyAgICBpZiAob2Jq ZWN0LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkgeworI2lmIEVOQUJMRShBQ0NFU1NJ QklMSVRZX0lTT0xBVEVEX1RSRUUpCisgICAgICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmpl Y3QoYWN0aXZlRGVzY2VuZGFudCk7CisjZW5kaWYKICAgICAgICAgdGFyZ2V0ID0gb2JqZWN0Owot ICAgIGVsc2UgaWYgKG9iamVjdC0+aXNDb21ib0JveCgpKSB7CisgICAgfSBlbHNlIGlmIChvYmpl Y3QtPmlzQ29tYm9Cb3goKSkgewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICAvLyBJZiB0 aGUgY29tYm9ib3gncyBhY3RpdmVEZXNjZW5kYW50IGlzIGluc2lkZSBhIGRlc2NlbmRhbnQgb3du ZWQgb3IgY29udHJvbGxlZCBieSB0aGUgY29tYm9ib3gsIHRoYXQgZGVzY2VuZGFudCBzaG91bGQg YmUgdGhlIHRhcmdldCBvZiB0aGUgbm90aWZpY2F0aW9uIGFuZCBub3QgdGhlIGNvbWJvYm94IGl0 c2VsZi4KICAgICAgICAgaWYgKGF1dG8qIG93bmVkT2JqZWN0ID0gQWNjZXNzaWJpbGl0eTo6Zmlu ZFJlbGF0ZWRPYmplY3RJbkFuY2VzdHJ5KCpvYmplY3QsIEFYUmVsYXRpb25UeXBlOjpPd25lckZv ciwgKmFjdGl2ZURlc2NlbmRhbnQpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuaAppbmRleCBmYWIwMzdhMjE4NmQuLmI0YzJhYThlNGMwNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTQ2MSw3ICs0NjEs NyBAQCBwcml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogaXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgp OwogICAgIC8vIFByb3BhZ2F0ZXMgdGhlIHJvb3Qgb2YgdGhlIGlzb2xhdGVkIHRyZWUgYmFjayBp bnRvIHRoZSBDb3JlIGFuZCBXZWJLaXQuCiAgICAgdm9pZCBzZXRJc29sYXRlZFRyZWVSb290KEFY Q29yZU9iamVjdCopOwotICAgIHZvaWQgc2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChOb2Rl Kik7CisgICAgdm9pZCBzZXRJc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KEFjY2Vzc2liaWxpdHlP YmplY3QqKTsKICAgICBSZWZQdHI8QVhJc29sYXRlZFRyZWU+IGdldE9yQ3JlYXRlSXNvbGF0ZWRU cmVlKCk7CiAgICAgdm9pZCBidWlsZElzb2xhdGVkVHJlZSgpOwogICAgIHZvaWQgdXBkYXRlSXNv bGF0ZWRUcmVlKEFjY2Vzc2liaWxpdHlPYmplY3QmLCBBWE5vdGlmaWNhdGlvbik7CkBAIC01MjEs NiArNTIxLDkgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2hvdWxkU2tpcEJvdW5kYXJ5KGNvbnN0 IENoYXJhY3Rlck9mZnNldCYsIGNvbnN0IENoYXJhY3Rlck9mZnNldCYpOwogcHJpdmF0ZToKICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiByb290V2ViQXJlYSgpOworCisgICAgLy8gVGhlIEFYIGZv Y3VzIGlzIG1vcmUgZmluZWdyYWluZWQgdGhhbiB0aGUgbm90aW9uIG9mIGZvY3VzZWQgTm9kZS4g VGhpcyBtZXRob2QgaGFuZGxlcyB0aG9zZSBjYXNlcyB3aGVyZSB0aGUgZm9jdXNlZCBBWCBvYmpl Y3QgaXMgYSBkZXNjZW5kYW50IG9yIGEgc3ViLXBhcnQgb2YgdGhlIGZvY3VzZWQgTm9kZS4KKyAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1c2VkT2JqZWN0Rm9yTm9kZShOb2RlKik7CiAgICAg c3RhdGljIEFjY2Vzc2liaWxpdHlPYmplY3QqIGZvY3VzZWRJbWFnZU1hcFVJRWxlbWVudChIVE1M QXJlYUVsZW1lbnQqKTsKIAogICAgIEFYSUQgZ2V0QVhJRChBY2Nlc3NpYmlsaXR5T2JqZWN0Kik7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FjdGl2ZS1kZXNjZW5kYW50 LWNoYW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1 cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAuLjhkYWEyZjEwMGExNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdlcy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdl cy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBhY3RpdmUgZGVzY2Vu ZGFudCBjaGFuZ2VzIHJlc3VsdCBpbiBmb2N1cyBjaGFuZ2VzLgorCitQQVNTOiBhY2Nlc3NpYmls aXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVyID09PSAnbGlzdGJveCcK K1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZp ZXIgPT09ICdpdGVtMScKK1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVt ZW50LmRvbUlkZW50aWZpZXIgPT09ICdpdGVtMicKK1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIgPT09ICdsaXN0Ym94JworCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3Vs dC1pbi1mb2N1cy1jaGFuZ2VzLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FjdGl2 ZS1kZXNjZW5kYW50LWNoYW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjA1YTIwZWJlMTYwMAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hh bmdlcy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9D VFlQRSBIVE1MPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxp dHktaGVscGVyLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJsaXN0 Ym94IiByb2xlPSJsaXN0Ym94IiB0YWJpbmRleD0iMCI+CisgICAgPGRpdiBpZD0iaXRlbTEiIHJv bGU9Imxpc3RpdGVtIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJpdGVtMiIgcm9sZT0ibGlzdGl0ZW0i PjwvZGl2PgorPC9kaXY+CisKKzxzY3JpcHQ+CitpZiAoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIp IHsKKyAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisgICAgbGV0IG91dHB1dCA9ICJU ZXN0cyB0aGF0IGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMgcmVzdWx0IGluIGZvY3VzIGNoYW5n ZXMuXG5cbiI7CisKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLmZvY3Vz KCk7CisgICAgc2V0VGltZW91dChhc3luYyAoKSA9PiB7CisgICAgICAgIHZhciBsaXN0Ym94ID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJsaXN0Ym94Iik7 CisgICAgICAgIG91dHB1dCArPSBhd2FpdCBleHBlY3RBc3luYygiYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRpZmllciIsICInbGlzdGJveCciKTsKKworICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLnNldEF0dHJpYnV0ZSgiYXJp YS1hY3RpdmVkZXNjZW5kYW50IiwgIml0ZW0xIik7CisgICAgICAgIG91dHB1dCArPSBhd2FpdCBl eHBlY3RBc3luYygiYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRl bnRpZmllciIsICInaXRlbTEnIik7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo Imxpc3Rib3giKS5zZXRBdHRyaWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIsICJpdGVtMiIp OworICAgICAgICBvdXRwdXQgKz0gYXdhaXQgZXhwZWN0QXN5bmMoImFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIiLCAiJ2l0ZW0yJyIpOworCisgICAg ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsaXN0Ym94IikucmVtb3ZlQXR0cmlidXRlKCJh cmlhLWFjdGl2ZWRlc2NlbmRhbnQiKTsKKyAgICAgICAgb3V0cHV0ICs9IGF3YWl0IGV4cGVjdEFz eW5jKCJhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVy IiwgIidsaXN0Ym94JyIpOworCisgICAgICAgIGRlYnVnKG91dHB1dCk7CisgICAgICAgIGZpbmlz aEpTVGVzdCgpOworICAgIH0sIDApOworfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Zvcm0tY29udHJvbC12YWx1ZS1z ZXR0YWJsZS5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9mb3JtLWNvbnRyb2wtdmFs dWUtc2V0dGFibGUuaHRtbAppbmRleCBlMGY1YjA5NWJkNmEuLjU1YzI4ZTAzOTI1ZSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9mb3JtLWNvbnRyb2wtdmFsdWUtc2V0dGFi bGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Zvcm0tY29udHJvbC12YWx1 ZS1zZXR0YWJsZS5odG1sCkBAIC00NSw3ICs0NSw3IEBAIGlmICh3aW5kb3cudGVzdFJ1bm5lciAm JiB3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKICAgICAgICAgc2V0VGltZW91dChm dW5jdGlvbigpIHsKICAgICAgICAgICAgIGRlYnVnKGlkKTsKICAgICAgICAgICAgIHNob3VsZEJl KCJkb2N1bWVudC5hY3RpdmVFbGVtZW50ID09IGVsZW1lbnQiLCAidHJ1ZSIpOwotICAgICAgICAg ICAgd2luZG93LmF4RWxlbWVudCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVt ZW50OworICAgICAgICAgICAgd2luZG93LmF4RWxlbWVudCA9IGFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZChpZCk7CiAgICAgICAgICAgICBzaG91bGRCZSgiYXhF bGVtZW50LmlzQXR0cmlidXRlU2V0dGFibGUoJ0FYVmFsdWUnKSIsIFN0cmluZyhleHBlY3RbaW5k ZXhdKSk7CiAKICAgICAgICAgICAgIGNoZWNrKGlkcywgZXhwZWN0LCArK2luZGV4KTsK 466615 2023-06-07 06:02:33 -0700 2023-06-07 12:25:26 -0700 Patch bug-257739-20230607090232.patch text/plain 9172 andresg_22 RnJvbSA0MGY4ZDdlNGQ3ZmU0NjI0MzgzNzUyYjQ0NzM3MTdiNjlkNWY5NWRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBNb24sIDUgSnVuIDIwMjMgMjI6MjM6MzAgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WDogQVhPYmplY3RDYWNoZTo6c2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdCBzaG91bGQgaGFu ZGxlCiB0aGUgc2FtZSBzcGVjaWFsIGNhc2VzIGFzIGZvY3VzZWRPYmplY3RGb3JQYWdlLgogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NzczOSA8cmRhcjovL3Byb2Js ZW0vMTEwMjkyMDc0PgoKUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2ggYW5kIFR5bGVyIFdpbGNv Y2suCgpBZGRlZCBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZSB0byBoYW5kbGUg dGhlIHNwZWNpYWwgY2FzZXMgZm9yIGJvdGggZm9jdXNlZE9iamVjdEZvclBhZ2UgYW5kIHNldElz b2xhdGVkVHJlZUZvY3VzZWRPYmplY3QuIFRoaXMgbWFrZXMgZ2V0dGluZyB0aGUgZm9jdXNlZCBv YmplY3QgbW9yZSBjb25zaXN0ZW50IGJldHdlZW4gSVRNIG9uIGFuZCBvZmYuIEl0IHdpbGwgYWxz byBhbGxvdyB0byBnZXQgdGhlIGZvY3VzZWQgT2JqZWN0IGZyb20gdGhlIElzb2xhdGVkIHRyZWUg d2l0aG91dCBoaXR0aW5nIHRoZSBtYWluIHRocmVhZC4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4 cGVjdGVkLnR4dDogQWRkZWQuCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVz Y2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLmh0bWw6IEFkZGVkLgoqIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpB WE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yUGFnZSk6CihXZWJDb3JlOjpBWE9iamVjdENh Y2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9kZSk6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpzZXRJ c29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmhhbmRs ZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKToKKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmhhbmRs ZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuaDoKLS0tCiAuLi4vV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0 Q2FjaGUuY3BwICAgfCA0MCArKysrKysrKystLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaCAgfCAgNSArKy0KIC4uLmFuZ2VzLXJlc3VsdC1pbi1m b2N1cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dCB8IDExICsrKysrCiAuLi5uZGFudC1jaGFuZ2VzLXJl c3VsdC1pbi1mb2N1cy1jaGFuZ2VzLmh0bWwgfCAzOSArKysrKysrKysrKysrKysrKysKIDQgZmls ZXMgY2hhbmdlZCwgNzQgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9k ZSAxMDA2NDQgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFu Z2VzLXJlc3VsdC1pbi1mb2N1cy1jaGFuZ2VzLWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAw NjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdlcy1y ZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy5odG1sCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggYWQ2NjM4OGE4MzQ1Li4wYWFhNzAwZTMxNTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApA QCAtNDgwLDM2ICs0ODAsMzQgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQVhPYmplY3RDYWNoZTo6 Zm9jdXNlZE9iamVjdEZvclBhZ2UoY29uc3QgUGFnZSogcGFnZSkKICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKICAgICBkb2N1bWVudC0+dXBkYXRlU3R5bGVJZk5lZWRlZCgpOworICAgIGlmIChh dXRvKiBmb2N1c2VkRWxlbWVudCA9IGRvY3VtZW50LT5mb2N1c2VkRWxlbWVudCgpKQorICAgICAg ICByZXR1cm4gZm9jdXNlZE9iamVjdEZvck5vZGUoZm9jdXNlZEVsZW1lbnQpOworICAgIHJldHVy biBmb2N1c2VkT2JqZWN0Rm9yTm9kZShkb2N1bWVudCk7Cit9CiAKLSAgICBFbGVtZW50KiBmb2N1 c2VkRWxlbWVudCA9IGRvY3VtZW50LT5mb2N1c2VkRWxlbWVudCgpOwotICAgIGlmIChpczxIVE1M QXJlYUVsZW1lbnQ+KGZvY3VzZWRFbGVtZW50KSkKLSAgICAgICAgcmV0dXJuIGZvY3VzZWRJbWFn ZU1hcFVJRWxlbWVudChkb3duY2FzdDxIVE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWRFbGVtZW50KSk7 CitBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0Rm9yTm9k ZShOb2RlKiBmb2N1c2VkTm9kZSkKK3sKKyAgICBpZiAoYXV0byogYXJlYSA9IGR5bmFtaWNEb3du Y2FzdDxIVE1MQXJlYUVsZW1lbnQ+KGZvY3VzZWROb2RlKSkKKyAgICAgICAgcmV0dXJuIGZvY3Vz ZWRJbWFnZU1hcFVJRWxlbWVudChhcmVhKTsKIAotICAgIGF1dG8qIGZvY3VzID0gZ2V0T3JDcmVh dGUoZm9jdXNlZEVsZW1lbnQgPyBmb2N1c2VkRWxlbWVudCA6IHN0YXRpY19jYXN0PE5vZGUqPihk b2N1bWVudCkpOworICAgIGF1dG8qIGZvY3VzID0gZ2V0T3JDcmVhdGUoZm9jdXNlZE5vZGUpOwog ICAgIGlmICghZm9jdXMpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKGZvY3Vz LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkgewogICAgICAgICBpZiAoYXV0byogZGVz Y2VuZGFudCA9IGZvY3VzLT5hY3RpdmVEZXNjZW5kYW50KCkpCi0gICAgICAgICAgICBmb2N1cyA9 IGRlc2NlbmRhbnQ7CisgICAgICAgICAgICByZXR1cm4gZGVzY2VuZGFudDsKICAgICB9Ci0KLSAg ICAvLyB0aGUgSFRNTCBlbGVtZW50LCBmb3IgZXhhbXBsZSwgaXMgZm9jdXNhYmxlIGJ1dCBoYXMg YW4gQVggb2JqZWN0IHRoYXQgaXMgaWdub3JlZAotICAgIGlmIChmb2N1cy0+YWNjZXNzaWJpbGl0 eUlzSWdub3JlZCgpKQotICAgICAgICBmb2N1cyA9IGZvY3VzLT5wYXJlbnRPYmplY3RVbmlnbm9y ZWQoKTsKLQogICAgIHJldHVybiBmb2N1czsKIH0KIAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZ X0lTT0xBVEVEX1RSRUUpCi12b2lkIEFYT2JqZWN0Q2FjaGU6OnNldElzb2xhdGVkVHJlZUZvY3Vz ZWRPYmplY3QoTm9kZSogZm9jdXNlZE5vZGUpCit2b2lkIEFYT2JqZWN0Q2FjaGU6OnNldElzb2xh dGVkVHJlZUZvY3VzZWRPYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCogZm9jdXMpCiB7CiAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBpZiAoIW1fcGFnZUlEKQogICAgICAgICByZXR1 cm47CiAKLSAgICBhdXRvKiBmb2N1cyA9IGdldE9yQ3JlYXRlKGZvY3VzZWROb2RlKTsKLQogICAg IGlmIChhdXRvIHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdlSUQp KQogICAgICAgICB0cmVlLT5zZXRGb2N1c2VkTm9kZUlEKGZvY3VzID8gZm9jdXMtPm9iamVjdElE KCkgOiBBWElEKCkpOwogfQpAQCAtMTUwMSwxNiArMTQ5OSwxNSBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OmRlZmVyTW9kYWxDaGFuZ2UoRWxlbWVudCogZWxlbWVudCkKICAgICBpZiAoIW1fcGVyZm9y bUNhY2hlVXBkYXRlVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9wZXJmb3JtQ2FjaGVVcGRh dGVUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKIH0KLSAgICAKKwogdm9pZCBBWE9iamVjdENhY2hl OjpoYW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZChOb2RlKiBvbGROb2RlLCBOb2RlKiBuZXdO b2RlLCBVcGRhdGVNb2RhbCB1cGRhdGVNb2RhbCkKIHsKLSNpZiBFTkFCTEUoQUNDRVNTSUJJTElU WV9JU09MQVRFRF9UUkVFKQotICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QobmV3Tm9k ZSk7Ci0jZW5kaWYKLQogICAgIGlmICh1cGRhdGVNb2RhbCA9PSBVcGRhdGVNb2RhbDo6WWVzKQog ICAgICAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7CiAgICAgaGFuZGxlTWVudUl0ZW1TZWxl Y3RlZChuZXdOb2RlKTsKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQor ICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoZm9jdXNlZE9iamVjdEZvck5vZGUobmV3 Tm9kZSkpOworI2VuZGlmCiAgICAgcGxhdGZvcm1IYW5kbGVGb2N1c2VkVUlFbGVtZW50Q2hhbmdl ZChvbGROb2RlLCBuZXdOb2RlKTsKIH0KICAgICAKQEAgLTIwNDgsOSArMjA0NSwxMiBAQCB2b2lk IEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKEVsZW1lbnQmIGVs ZW1lbnQpCiAKICAgICAvLyBIYW5kbGUgYWN0aXZlLWRlc2NlbmRhbnQgY2hhbmdlcyB3aGVuIHRo ZSB0YXJnZXQgYWxsb3dzIGZvciBpdCwgb3IgdGhlIGNvbnRyb2xsZWQgb2JqZWN0IGFsbG93cyBm b3IgaXQuCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogdGFyZ2V0ID0gbnVsbHB0cjsKLSAgICBp ZiAob2JqZWN0LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkKKyAgICBpZiAob2JqZWN0 LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkgeworI2lmIEVOQUJMRShBQ0NFU1NJQklM SVRZX0lTT0xBVEVEX1RSRUUpCisgICAgICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3Qo YWN0aXZlRGVzY2VuZGFudCk7CisjZW5kaWYKICAgICAgICAgdGFyZ2V0ID0gb2JqZWN0OwotICAg IGVsc2UgaWYgKG9iamVjdC0+aXNDb21ib0JveCgpKSB7CisgICAgfSBlbHNlIGlmIChvYmplY3Qt PmlzQ29tYm9Cb3goKSkgewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICAvLyBJZiB0aGUg Y29tYm9ib3gncyBhY3RpdmVEZXNjZW5kYW50IGlzIGluc2lkZSBhIGRlc2NlbmRhbnQgb3duZWQg b3IgY29udHJvbGxlZCBieSB0aGUgY29tYm9ib3gsIHRoYXQgZGVzY2VuZGFudCBzaG91bGQgYmUg dGhlIHRhcmdldCBvZiB0aGUgbm90aWZpY2F0aW9uIGFuZCBub3QgdGhlIGNvbWJvYm94IGl0c2Vs Zi4KICAgICAgICAgaWYgKGF1dG8qIG93bmVkT2JqZWN0ID0gQWNjZXNzaWJpbGl0eTo6ZmluZFJl bGF0ZWRPYmplY3RJbkFuY2VzdHJ5KCpvYmplY3QsIEFYUmVsYXRpb25UeXBlOjpPd25lckZvciwg KmFjdGl2ZURlc2NlbmRhbnQpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuaAppbmRleCBmYWIwMzdhMjE4NmQuLmI0YzJhYThlNGMwNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTQ2MSw3ICs0NjEsNyBA QCBwcml2YXRlOgogICAgIEFYQ29yZU9iamVjdCogaXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgpOwog ICAgIC8vIFByb3BhZ2F0ZXMgdGhlIHJvb3Qgb2YgdGhlIGlzb2xhdGVkIHRyZWUgYmFjayBpbnRv IHRoZSBDb3JlIGFuZCBXZWJLaXQuCiAgICAgdm9pZCBzZXRJc29sYXRlZFRyZWVSb290KEFYQ29y ZU9iamVjdCopOwotICAgIHZvaWQgc2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChOb2RlKik7 CisgICAgdm9pZCBzZXRJc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmpl Y3QqKTsKICAgICBSZWZQdHI8QVhJc29sYXRlZFRyZWU+IGdldE9yQ3JlYXRlSXNvbGF0ZWRUcmVl KCk7CiAgICAgdm9pZCBidWlsZElzb2xhdGVkVHJlZSgpOwogICAgIHZvaWQgdXBkYXRlSXNvbGF0 ZWRUcmVlKEFjY2Vzc2liaWxpdHlPYmplY3QmLCBBWE5vdGlmaWNhdGlvbik7CkBAIC01MjEsNiAr NTIxLDkgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2hvdWxkU2tpcEJvdW5kYXJ5KGNvbnN0IENo YXJhY3Rlck9mZnNldCYsIGNvbnN0IENoYXJhY3Rlck9mZnNldCYpOwogcHJpdmF0ZToKICAgICBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiByb290V2ViQXJlYSgpOworCisgICAgLy8gVGhlIEFYIGZvY3Vz IGlzIG1vcmUgZmluZWdyYWluZWQgdGhhbiB0aGUgbm90aW9uIG9mIGZvY3VzZWQgTm9kZS4gVGhp cyBtZXRob2QgaGFuZGxlcyB0aG9zZSBjYXNlcyB3aGVyZSB0aGUgZm9jdXNlZCBBWCBvYmplY3Qg aXMgYSBkZXNjZW5kYW50IG9yIGEgc3ViLXBhcnQgb2YgdGhlIGZvY3VzZWQgTm9kZS4KKyAgICBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBmb2N1c2VkT2JqZWN0Rm9yTm9kZShOb2RlKik7CiAgICAgc3Rh dGljIEFjY2Vzc2liaWxpdHlPYmplY3QqIGZvY3VzZWRJbWFnZU1hcFVJRWxlbWVudChIVE1MQXJl YUVsZW1lbnQqKTsKIAogICAgIEFYSUQgZ2V0QVhJRChBY2Nlc3NpYmlsaXR5T2JqZWN0Kik7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FjdGl2ZS1kZXNjZW5kYW50LWNo YW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1pbi1mb2N1cy1j aGFuZ2VzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAuLjhkYWEyZjEwMGExNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdlcy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBhY3RpdmUgZGVzY2VuZGFu dCBjaGFuZ2VzIHJlc3VsdCBpbiBmb2N1cyBjaGFuZ2VzLgorCitQQVNTOiBhY2Nlc3NpYmlsaXR5 Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVyID09PSAnbGlzdGJveCcKK1BB U1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIg PT09ICdpdGVtMScKK1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50 LmRvbUlkZW50aWZpZXIgPT09ICdpdGVtMicKK1BBU1M6IGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIgPT09ICdsaXN0Ym94JworCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hY3RpdmUtZGVzY2VuZGFudC1jaGFuZ2VzLXJlc3VsdC1p bi1mb2N1cy1jaGFuZ2VzLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FjdGl2ZS1k ZXNjZW5kYW50LWNoYW5nZXMtcmVzdWx0LWluLWZvY3VzLWNoYW5nZXMuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjA1YTIwZWJlMTYwMAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYWN0aXZlLWRlc2NlbmRhbnQtY2hhbmdl cy1yZXN1bHQtaW4tZm9jdXMtY2hhbmdlcy5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9DVFlQ RSBIVE1MPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVz dC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHkt aGVscGVyLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCis8ZGl2IGlkPSJsaXN0Ym94 IiByb2xlPSJsaXN0Ym94IiB0YWJpbmRleD0iMCI+CisgICAgPGRpdiBpZD0iaXRlbTEiIHJvbGU9 Imxpc3RpdGVtIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJpdGVtMiIgcm9sZT0ibGlzdGl0ZW0iPjwv ZGl2PgorPC9kaXY+CisKKzxzY3JpcHQ+CitpZiAoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsK KyAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisgICAgbGV0IG91dHB1dCA9ICJUZXN0 cyB0aGF0IGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMgcmVzdWx0IGluIGZvY3VzIGNoYW5nZXMu XG5cbiI7CisKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLmZvY3VzKCk7 CisgICAgc2V0VGltZW91dChhc3luYyAoKSA9PiB7CisgICAgICAgIHZhciBsaXN0Ym94ID0gYWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJsaXN0Ym94Iik7Cisg ICAgICAgIG91dHB1dCArPSBhd2FpdCBleHBlY3RBc3luYygiYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRpZmllciIsICInbGlzdGJveCciKTsKKworICAgICAg ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLnNldEF0dHJpYnV0ZSgiYXJpYS1h Y3RpdmVkZXNjZW5kYW50IiwgIml0ZW0xIik7CisgICAgICAgIG91dHB1dCArPSBhd2FpdCBleHBl Y3RBc3luYygiYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuZG9tSWRlbnRp ZmllciIsICInaXRlbTEnIik7CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImxp c3Rib3giKS5zZXRBdHRyaWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIsICJpdGVtMiIpOwor ICAgICAgICBvdXRwdXQgKz0gYXdhaXQgZXhwZWN0QXN5bmMoImFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmZvY3VzZWRFbGVtZW50LmRvbUlkZW50aWZpZXIiLCAiJ2l0ZW0yJyIpOworCisgICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsaXN0Ym94IikucmVtb3ZlQXR0cmlidXRlKCJhcmlh LWFjdGl2ZWRlc2NlbmRhbnQiKTsKKyAgICAgICAgb3V0cHV0ICs9IGF3YWl0IGV4cGVjdEFzeW5j KCJhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5kb21JZGVudGlmaWVyIiwg IidsaXN0Ym94JyIpOworCisgICAgICAgIGRlYnVnKG91dHB1dCk7CisgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgIH0sIDApOworfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==