237621 2022-03-08 15:12:59 -0800 In isolated tree mode, do not call NSAccessibilityUnregisterUniqueIdForUIElement until the isolated object is detached. 2022-03-09 18:45:06 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1849418 0 andresg_22 2022-03-08 15:12:59 -0800 In isolated tree mode, do not call NSAccessibilityUnregisterUniqueIdForUIElement until the isolated object is detached. 1849419 1 webkit-bug-importer 2022-03-08 15:13:08 -0800 <rdar://problem/89992486> 1849434 2 454159 andresg_22 2022-03-08 15:27:52 -0800 Created attachment 454159 Patch 1849465 3 454159 cfleizach 2022-03-08 16:22:06 -0800 Comment on attachment 454159 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454159&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 > + if (!AXObjectCache::isIsolatedTreeEnabled()) I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element 1849472 4 andresg_22 2022-03-08 16:35:48 -0800 (In reply to chris fleizach from comment #3) > Comment on attachment 454159 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454159&action=review > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 > > + if (!AXObjectCache::isIsolatedTreeEnabled()) > > I think we may want to verify that this wrapper DOES have an isolated object > with it, otherwise its possible this object will only exist on the main > thread and never get an isolated element The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. 1849473 5 454159 cfleizach 2022-03-08 16:38:58 -0800 Comment on attachment 454159 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454159&action=review >>> Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 >>> + if (!AXObjectCache::isIsolatedTreeEnabled()) >> >> I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element > > The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. can we check for its presence safely? just doing a read on the pointer value? 1849478 6 andresg_22 2022-03-08 16:53:38 -0800 (In reply to chris fleizach from comment #5) > Comment on attachment 454159 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454159&action=review > > >>> Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 > >>> + if (!AXObjectCache::isIsolatedTreeEnabled()) > >> > >> I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element > > > > The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. > > can we check for its presence safely? just doing a read on the pointer value? There is no guaranty that we can read that pointer on the main thread. The AX thread could be writing to it at that point, and thus you would read garbage. For instance, in the AXObjectCache we have: #if ENABLE(ACCESSIBILITY_ISOLATED_TREE) if (m_pageID) { if (auto tree = AXIsolatedTree::treeForPageID(*m_pageID)) tree->removeNode(*object); } #endif object->detach(AccessibilityDetachmentType::ElementDestroyed); tree->removeNode will schedule the isolated object to be detached, so when the live object detach is called, the applyPendingChanges may be detaching the isolated object. I think we would need to add a variable to be accessed on the main thread to signal whether the isolated object was attached or not. 1849485 7 andresg_22 2022-03-08 17:04:10 -0800 (In reply to Andres Gonzalez from comment #6) > (In reply to chris fleizach from comment #5) > > Comment on attachment 454159 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=454159&action=review > > > > >>> Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 > > >>> + if (!AXObjectCache::isIsolatedTreeEnabled()) > > >> > > >> I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element > > > > > > The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. > > > > can we check for its presence safely? just doing a read on the pointer value? > > There is no guaranty that we can read that pointer on the main thread. The > AX thread could be writing to it at that point, and thus you would read > garbage. For instance, in the AXObjectCache we have: > > #if ENABLE(ACCESSIBILITY_ISOLATED_TREE) > if (m_pageID) { > if (auto tree = AXIsolatedTree::treeForPageID(*m_pageID)) > tree->removeNode(*object); > } > #endif > > object->detach(AccessibilityDetachmentType::ElementDestroyed); > > tree->removeNode will schedule the isolated object to be detached, so when > the live object detach is called, the applyPendingChanges may be detaching > the isolated object. > > I think we would need to add a variable to be accessed on the main thread to > signal whether the isolated object was attached or not. Maybe if I revert the order in the AXObjectCache snippet above, then it will be fine to read that pointer on the main thread. 1849506 8 454159 cfleizach 2022-03-08 18:07:16 -0800 Comment on attachment 454159 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454159&action=review >>>>>> Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 >>>>>> + if (!AXObjectCache::isIsolatedTreeEnabled()) >>>>> >>>>> I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element >>>> >>>> The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. >>> >>> can we check for its presence safely? just doing a read on the pointer value? >> >> There is no guaranty that we can read that pointer on the main thread. The AX thread could be writing to it at that point, and thus you would read garbage. For instance, in the AXObjectCache we have: >> >> #if ENABLE(ACCESSIBILITY_ISOLATED_TREE) >> if (m_pageID) { >> if (auto tree = AXIsolatedTree::treeForPageID(*m_pageID)) >> tree->removeNode(*object); >> } >> #endif >> >> object->detach(AccessibilityDetachmentType::ElementDestroyed); >> >> tree->removeNode will schedule the isolated object to be detached, so when the live object detach is called, the applyPendingChanges may be detaching the isolated object. >> >> I think we would need to add a variable to be accessed on the main thread to signal whether the isolated object was attached or not. > > Maybe if I revert the order in the AXObjectCache snippet above, then it will be fine to read that pointer on the main thread. Or adding a tracking bit seems ok too 1849509 9 andresg_22 2022-03-08 18:11:27 -0800 (In reply to chris fleizach from comment #8) > Comment on attachment 454159 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454159&action=review > > >>>>>> Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:535 > >>>>>> + if (!AXObjectCache::isIsolatedTreeEnabled()) > >>>>> > >>>>> I think we may want to verify that this wrapper DOES have an isolated object with it, otherwise its possible this object will only exist on the main thread and never get an isolated element > >>>> > >>>> The problem with accessing the wrapper's m_isolatedObject here is that this is on the main thread, and m_isolatedObject should only be accessed on the AX thread after creation. > >>> > >>> can we check for its presence safely? just doing a read on the pointer value? > >> > >> There is no guaranty that we can read that pointer on the main thread. The AX thread could be writing to it at that point, and thus you would read garbage. For instance, in the AXObjectCache we have: > >> > >> #if ENABLE(ACCESSIBILITY_ISOLATED_TREE) > >> if (m_pageID) { > >> if (auto tree = AXIsolatedTree::treeForPageID(*m_pageID)) > >> tree->removeNode(*object); > >> } > >> #endif > >> > >> object->detach(AccessibilityDetachmentType::ElementDestroyed); > >> > >> tree->removeNode will schedule the isolated object to be detached, so when the live object detach is called, the applyPendingChanges may be detaching the isolated object. > >> > >> I think we would need to add a variable to be accessed on the main thread to signal whether the isolated object was attached or not. > > > > Maybe if I revert the order in the AXObjectCache snippet above, then it will be fine to read that pointer on the main thread. > > Or adding a tracking bit seems ok too Yes, that is actually the only choice because the m_isolatedObject can be written to not only in detach but in AXIsolatedObject::attachPlatformWrapper which is called during updates in applyPendingChanges on the AX thread, so it can be called at any time. 1849708 10 454245 andresg_22 2022-03-09 09:12:29 -0800 Created attachment 454245 Patch 1849709 11 454245 cfleizach 2022-03-09 09:15:50 -0800 Comment on attachment 454245 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454245&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:290 > + m_isolatedObjectInitialized = false; do we need this? won't it be false by default 1849714 12 454249 andresg_22 2022-03-09 09:22:33 -0800 Created attachment 454249 Patch 1849715 13 andresg_22 2022-03-09 09:25:19 -0800 (In reply to chris fleizach from comment #11) > Comment on attachment 454245 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454245&action=review > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:290 > > + m_isolatedObjectInitialized = false; > > do we need this? won't it be false by default Right, ObjC does that! Fixed in latest rev. 1849939 14 ews-feeder 2022-03-09 18:45:01 -0800 Committed r291084 (248246@main): <https://commits.webkit.org/248246@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454249. 454159 2022-03-08 15:27:52 -0800 2022-03-09 09:12:26 -0800 Patch bug-237621-20220308182751.patch text/plain 3415 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMmIwZGY4MTI1NTk1 OTBhZmQwNDZlYTFkNzg2YThkNjllMjNlMi4uYTY5ZDZkMDI1ZTJlNDgzY2UxODVmYWI1NzdmZDc5 NDc3MGNmMzRiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTA4ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUsIGRvIG5vdCBjYWxsIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJ ZEZvclVJRWxlbWVudCB1bnRpbCB0aGUgaXNvbGF0ZWQgb2JqZWN0IGlzIGRldGFjaGVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjIxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84OTk5MjQ4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBsaXZlIG9iamVjdCBpcyBkZXRhY2hlZCBm cm9tIGl0cyB3cmFwcGVyIG9uIHRoZSBtYWluIHRocmVhZCwKKyAgICAgICAgdGhlIHdyYXBwZXIg bWF5IGJlIGluIHRoZSBtaWRkbGUgb2Ygc2VydmluZyBhIHJlcXVlc3Qgb24gdGhlIEFYIHRocmVh ZC4KKyAgICAgICAgVGhlcmVmb3JlIGNhbGxpbmcgTlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVu aXF1ZUlkRm9yVUlFbGVtZW50IG1heQorICAgICAgICBpbnRlcmZlcmUgd2l0aCB0aGUgY29tcGxl dGlvbmcgb2YgdGhlIHJlcXVlc3QsIG9yIGV2ZW4gY2F1c2UgdW5kZWZpbmVkCisgICAgICAgIGJl aGF2aW9yIHNpbmNlIG1hbnkgb2YgdGhlIGludGVybmFsIGxvb2t1cHMgZm9yIG9iamVjdHMgZGVw ZW5kIG9uIGEgZGF0YQorICAgICAgICBzdHJ1Y3R1cmUgdXBkYXRlZCBieSBzeXN0ZW0gY2FsbC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSB1bnJlZ2lzdGVyIGEKKyAgICAgICAgd3JhcHBlciB3aGVuIHRo ZSBpc29sYXRlZCBvYmplY3QgaXMgZGV0YWNoZWQsIHdoaWNoIGhhcHBlbnMgYWZ0ZXIgdGhlCisg ICAgICAgIGxpdmUgb2JqZWN0IGlzIGRldGFjaGVkLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGRldGFjaF0pOgorICAgICAgICAoLVtXZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlciBkZXRhY2hJc29sYXRlZE9iamVjdDpdKToKKyAgICAgICAg KC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlF bGVtZW50XSk6IERlbGV0ZWQuCisKIDIwMjItMDMtMDggIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNh dGFuemFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gU3luYyBndGstb3ZlcmxheS1zY3Jv bGxpbmcgc2V0dGluZyB0byB3ZWIgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlck1hYy5tbQppbmRleCA0OTA4YjBhNWE0NzNjNDdmMDUxM2YzYjM0MzE4MjQzYWUzNDUyNDJk Li5iZTU2MjFmZDc2ZmE4NDRjNWRiMzc3M2I5MzQ2ZTJjODJkOGVjYzc4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3Jh cHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtNTI0LDIxICs1MjQsMjggQEAgZXh0ZXJu ICJDIiBBWFVJRWxlbWVudFJlZiBOU0FjY2Vzc2liaWxpdHlDcmVhdGVBWFVJRWxlbWVudFJlZihp ZCBlbGVtZW50KTsKIAogQGltcGxlbWVudGF0aW9uIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyCiAKLS0gKHZvaWQpdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50CistICh2b2lkKWRl dGFjaAogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgTlNBY2Nlc3NpYmlsaXR5 VW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50KHNlbGYpOworCisgICAgLy8gSW4gaXNvbGF0 ZWQgdHJlZSBtb2RlLCBkbyBub3QgVW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50IGhlcmUg YmVjYXVzZSB0aGUgd3JhcHBlciBtYXkgYmUgaW4gdGhlIG1pZGRsZSBvZiBzZXJ2aW5nIGEgcmVx dWVzdCBvbiB0aGUgQVggdGhyZWFkLgorICAgIC8vIFRoZSBJc29sYXRlZE9iamVjdCBpcyBjYXBh YmxlIHRvIHRlbmQgdG8gc29tZSByZXF1ZXN0cyBhZnRlciB0aGUgbGl2ZSBvYmplY3QgaXMgZ29u ZS4KKyAgICAvLyBJbiByZWd1bGFyIG1vZGUsIFVucmVnaXN0ZXJVbmlxdWVJZEZvclVJRWxlbWVu dCBpbW1lZGlhdGVseS4KKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQor ICAgIGlmICghQVhPYmplY3RDYWNoZTo6aXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCisjZW5kaWYK KyAgICAgICAgTlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50KHNl bGYpOworCisgICAgW3N1cGVyIGRldGFjaF07CiB9CiAKLS0gKHZvaWQpZGV0YWNoCisjaWYgRU5B QkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKy0gKHZvaWQpZGV0YWNoSXNvbGF0ZWRP YmplY3Q6KEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSlkZXRhY2htZW50VHlwZQogewotICAg IC8vIFNlbmQgdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50IHVuY29uZGl0aW9uYWxseSBi ZWNhdXNlIGlmIGl0IGlzCi0gICAgLy8gZXZlciBhY2NpZGVudGFsbHkgbm90IGRvbmUgKHZpYSBv dGhlciBidWdzIGluIG91ciBBWCBpbXBsZW1lbnRhdGlvbikgeW91Ci0gICAgLy8gZW5kIHVwIHdp dGggYSBjcmFzaCBsaWtlIDxyZGFyOi8vcHJvYmxlbS80MjczMTQ5Pi4gIEl0IGlzIHNhZmUgYW5k IG5vdAotICAgIC8vIGV4cGVuc2l2ZSB0byBzZW5kIGV2ZW4gaWYgdGhlIG9iamVjdCBpcyBub3Qg cmVnaXN0ZXJlZC4KLSAgICBbc2VsZiB1bnJlZ2lzdGVyVW5pcXVlSWRGb3JVSUVsZW1lbnRdOwot ICAgIFtzdXBlciBkZXRhY2hdOworICAgIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJ ZEZvclVJRWxlbWVudChzZWxmKTsKKyAgICBbc3VwZXIgZGV0YWNoSXNvbGF0ZWRPYmplY3Q6ZGV0 YWNobWVudFR5cGVdOwogfQorI2VuZGlmCiAKIC0gKGlkKWF0dGFjaG1lbnRWaWV3CiB7Cg== 454245 2022-03-09 09:12:29 -0800 2022-03-09 09:22:29 -0800 Patch bug-237621-20220309121228.patch text/plain 5743 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMmIwZGY4MTI1NTk1 OTBhZmQwNDZlYTFkNzg2YThkNjllMjNlMi4uMjM1MzM2MmFmNmFjMDY5YTQ4ZWUxNzZkZmQwM2Mz NDdlY2JmM2I1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAzLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUsIGRvIG5vdCBjYWxsIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJ ZEZvclVJRWxlbWVudCB1bnRpbCB0aGUgaXNvbGF0ZWQgb2JqZWN0IGlzIGRldGFjaGVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjIxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84OTk5MjQ4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJp cyBGbGVpemFjaC4KKworICAgICAgICBXaGVuIHRoZSBsaXZlIG9iamVjdCBpcyBkZXRhY2hlZCBm cm9tIGl0cyB3cmFwcGVyIG9uIHRoZSBtYWluIHRocmVhZCwKKyAgICAgICAgdGhlIHdyYXBwZXIg bWF5IGJlIGluIHRoZSBtaWRkbGUgb2Ygc2VydmluZyBhIHJlcXVlc3Qgb24gdGhlIEFYIHRocmVh ZC4KKyAgICAgICAgVGhlcmVmb3JlIGNhbGxpbmcgTlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVu aXF1ZUlkRm9yVUlFbGVtZW50IG1heQorICAgICAgICBpbnRlcmZlcmUgd2l0aCB0aGUgY29tcGxl dGlvbmcgb2YgdGhlIHJlcXVlc3QsIG9yIGV2ZW4gY2F1c2UgdW5kZWZpbmVkCisgICAgICAgIGJl aGF2aW9yIHNpbmNlIG1hbnkgb2YgdGhlIGludGVybmFsIGxvb2t1cHMgZm9yIG9iamVjdHMgZGVw ZW5kIG9uIGEgZGF0YQorICAgICAgICBzdHJ1Y3R1cmUgdXBkYXRlZCBieSBzeXN0ZW0gY2FsbC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSB1bnJlZ2lzdGVyIGEKKyAgICAgICAgd3JhcHBlciB3aGVuIHRo ZSBpc29sYXRlZCBvYmplY3QgaXMgZGV0YWNoZWQsIHdoaWNoIGhhcHBlbnMgYWZ0ZXIgdGhlCisg ICAgICAgIGxpdmUgb2JqZWN0IGlzIGRldGFjaGVkLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmg6CisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tOgorICAg ICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgaW5pdFdpdGhBY2Nlc3Np YmlsaXR5T2JqZWN0Ol0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UgYXR0YWNoSXNvbGF0ZWRPYmplY3Q6XSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGRldGFjaF0pOgorICAgICAgICAoLVtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBkZXRhY2hJc29sYXRlZE9iamVjdDpdKToKKyAgICAgICAgKC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVt ZW50XSk6IERlbGV0ZWQuCisKIDIwMjItMDMtMDggIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gU3luYyBndGstb3ZlcmxheS1zY3JvbGxp bmcgc2V0dGluZyB0byB3ZWIgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UuaAppbmRleCA4ZGMzNTM4MDgyYjcxZjY3M2Q3ZjJmNjQyNzA4ZTg0NGRjY2M3ZTAxLi5i YjI5ZThiZmExNTQ0ZTkxMTIyZGE2ZDJjOTUyNTc5ZGM1ODEwODZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaApAQCAtNjMsOSArNjMsMTMgQEAgdm9pZCBBWEF0dHJp YnV0ZWRTdHJpbmdTZXRGb250KE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgKiwgQ1RGb250UmVm LCBjb25zdCBOU1IKIAogQGludGVyZmFjZSBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJh c2UgOiBOU09iamVjdCB7CiAgICAgV2ViQ29yZTo6QVhDb3JlT2JqZWN0KiBtX2F4T2JqZWN0Owor CiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKICAgICBXZWJDb3JlOjpB WENvcmVPYmplY3QqIG1faXNvbGF0ZWRPYmplY3Q7CisgICAgLy8gVG8gYmUgYWNjZXNzZWQgb25s eSBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgYm9vbCBtX2lzb2xhdGVkT2JqZWN0SW5pdGlhbGl6 ZWQ7CiAjZW5kaWYKKwogICAgIFdlYkNvcmU6OkFYSUQgX2lkZW50aWZpZXI7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyQmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCA4NDdmYzA1ZjFmM2ZmMTFl MWEwYmYwODgwNWE1MTI3ZmNjZjJiMWZkLi4wNDgzNjc2MDQ1ZjRmOGQ3MzMyZmNhZTBlZGRmYmJk N2RjYWM5ZjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCkBA IC0yNzksMTAgKzI3OSwxNyBAQCBOU0FycmF5ICptYWtlTlNBcnJheShjb25zdCBXZWJDb3JlOjpB WENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgYwogCiAtIChpZClpbml0 V2l0aEFjY2Vzc2liaWxpdHlPYmplY3Q6KEFYQ29yZU9iamVjdCopYXhPYmplY3QKIHsKKyAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOworCiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkp CiAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICBbc2VsZiBhdHRhY2hBWE9iamVjdDpheE9iamVj dF07CisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIG1faXNv bGF0ZWRPYmplY3RJbml0aWFsaXplZCA9IGZhbHNlOworI2VuZGlmCisKICAgICByZXR1cm4gc2Vs ZjsKIH0KIApAQCAtMjk5LDYgKzMwNiw5IEBAIE5TQXJyYXkgKm1ha2VOU0FycmF5KGNvbnN0IFdl YkNvcmU6OkFYQ29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjCiB7CiAg ICAgQVNTRVJUKGlzb2xhdGVkT2JqZWN0ICYmICghX2lkZW50aWZpZXIuaXNWYWxpZCgpIHx8IF9p ZGVudGlmaWVyID09IGlzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpKSk7CiAgICAgbV9pc29sYXRl ZE9iamVjdCA9IGlzb2xhdGVkT2JqZWN0OworICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICAg ICAgbV9pc29sYXRlZE9iamVjdEluaXRpYWxpemVkID0gdHJ1ZTsKKwogICAgIGlmICghX2lkZW50 aWZpZXIuaXNWYWxpZCgpKQogICAgICAgICBfaWRlbnRpZmllciA9IG1faXNvbGF0ZWRPYmplY3Qt Pm9iamVjdElEKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCmlu ZGV4IDQ5MDhiMGE1YTQ3M2M0N2YwNTEzZjNiMzQzMTgyNDNhZTM0NTI0MmQuLmVlOTkwMDYyOTFk MzE4ZDUyOTNhY2M5NDQ4ZDA1NzgwNjFhNGU1NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tCkBAIC01MjQsMjEgKzUyNCwyOCBAQCBleHRlcm4gIkMiIEFYVUlFbGVt ZW50UmVmIE5TQWNjZXNzaWJpbGl0eUNyZWF0ZUFYVUlFbGVtZW50UmVmKGlkIGVsZW1lbnQpOwog CiBAaW1wbGVtZW50YXRpb24gV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIKIAotLSAodm9p ZCl1bnJlZ2lzdGVyVW5pcXVlSWRGb3JVSUVsZW1lbnQKKy0gKHZvaWQpZGV0YWNoCiB7CiAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBOU0FjY2Vzc2liaWxpdHlVbnJlZ2lzdGVyVW5p cXVlSWRGb3JVSUVsZW1lbnQoc2VsZik7CisKKyAgICAvLyBJZiB0aGUgSXNvbGF0ZWRPYmplY3Qg aXMgaW5pdGlhbGl6ZWQsIGRvIG5vdCBVbnJlZ2lzdGVyVW5pcXVlSWRGb3JVSUVsZW1lbnQgaGVy ZSBiZWNhdXNlIHRoZSB3cmFwcGVyIG1heSBiZSBpbiB0aGUgbWlkZGxlIG9mIHNlcnZpbmcgYSBy ZXF1ZXN0IG9uIHRoZSBBWCB0aHJlYWQuCisgICAgLy8gVGhlIElzb2xhdGVkT2JqZWN0IGlzIGNh cGFibGUgdG8gdGVuZCB0byBzb21lIHJlcXVlc3RzIGFmdGVyIHRoZSBsaXZlIG9iamVjdCBpcyBn b25lLgorICAgIC8vIEluIHJlZ3VsYXIgbW9kZSwgVW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVt ZW50IGltbWVkaWF0ZWx5LgorI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUp CisgICAgaWYgKCFtX2lzb2xhdGVkT2JqZWN0SW5pdGlhbGl6ZWQpCisjZW5kaWYKKyAgICAgICAg TlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50KHNlbGYpOworCisg ICAgW3N1cGVyIGRldGFjaF07CiB9CiAKLS0gKHZvaWQpZGV0YWNoCisjaWYgRU5BQkxFKEFDQ0VT U0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKy0gKHZvaWQpZGV0YWNoSXNvbGF0ZWRPYmplY3Q6KEFj Y2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSlkZXRhY2htZW50VHlwZQogewotICAgIC8vIFNlbmQg dW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50IHVuY29uZGl0aW9uYWxseSBiZWNhdXNlIGlm IGl0IGlzCi0gICAgLy8gZXZlciBhY2NpZGVudGFsbHkgbm90IGRvbmUgKHZpYSBvdGhlciBidWdz IGluIG91ciBBWCBpbXBsZW1lbnRhdGlvbikgeW91Ci0gICAgLy8gZW5kIHVwIHdpdGggYSBjcmFz aCBsaWtlIDxyZGFyOi8vcHJvYmxlbS80MjczMTQ5Pi4gIEl0IGlzIHNhZmUgYW5kIG5vdAotICAg IC8vIGV4cGVuc2l2ZSB0byBzZW5kIGV2ZW4gaWYgdGhlIG9iamVjdCBpcyBub3QgcmVnaXN0ZXJl ZC4KLSAgICBbc2VsZiB1bnJlZ2lzdGVyVW5pcXVlSWRGb3JVSUVsZW1lbnRdOwotICAgIFtzdXBl ciBkZXRhY2hdOworICAgIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJZEZvclVJRWxl bWVudChzZWxmKTsKKyAgICBbc3VwZXIgZGV0YWNoSXNvbGF0ZWRPYmplY3Q6ZGV0YWNobWVudFR5 cGVdOwogfQorI2VuZGlmCiAKIC0gKGlkKWF0dGFjaG1lbnRWaWV3CiB7Cg== 454249 2022-03-09 09:22:33 -0800 2022-03-09 18:45:04 -0800 Patch bug-237621-20220309122232.patch text/plain 5645 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRiMmIwZGY4MTI1NTk1 OTBhZmQwNDZlYTFkNzg2YThkNjllMjNlMi4uMjM1MzM2MmFmNmFjMDY5YTQ4ZWUxNzZkZmQwM2Mz NDdlY2JmM2I1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAzLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbiBpc29sYXRl ZCB0cmVlIG1vZGUsIGRvIG5vdCBjYWxsIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJ ZEZvclVJRWxlbWVudCB1bnRpbCB0aGUgaXNvbGF0ZWQgb2JqZWN0IGlzIGRldGFjaGVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjIxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84OTk5MjQ4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJp cyBGbGVpemFjaC4KKworICAgICAgICBXaGVuIHRoZSBsaXZlIG9iamVjdCBpcyBkZXRhY2hlZCBm cm9tIGl0cyB3cmFwcGVyIG9uIHRoZSBtYWluIHRocmVhZCwKKyAgICAgICAgdGhlIHdyYXBwZXIg bWF5IGJlIGluIHRoZSBtaWRkbGUgb2Ygc2VydmluZyBhIHJlcXVlc3Qgb24gdGhlIEFYIHRocmVh ZC4KKyAgICAgICAgVGhlcmVmb3JlIGNhbGxpbmcgTlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVu aXF1ZUlkRm9yVUlFbGVtZW50IG1heQorICAgICAgICBpbnRlcmZlcmUgd2l0aCB0aGUgY29tcGxl dGlvbmcgb2YgdGhlIHJlcXVlc3QsIG9yIGV2ZW4gY2F1c2UgdW5kZWZpbmVkCisgICAgICAgIGJl aGF2aW9yIHNpbmNlIG1hbnkgb2YgdGhlIGludGVybmFsIGxvb2t1cHMgZm9yIG9iamVjdHMgZGVw ZW5kIG9uIGEgZGF0YQorICAgICAgICBzdHJ1Y3R1cmUgdXBkYXRlZCBieSBzeXN0ZW0gY2FsbC4g V2l0aCB0aGlzIHBhdGNoLCB3ZSB1bnJlZ2lzdGVyIGEKKyAgICAgICAgd3JhcHBlciB3aGVuIHRo ZSBpc29sYXRlZCBvYmplY3QgaXMgZGV0YWNoZWQsIHdoaWNoIGhhcHBlbnMgYWZ0ZXIgdGhlCisg ICAgICAgIGxpdmUgb2JqZWN0IGlzIGRldGFjaGVkLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmg6CisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tOgorICAg ICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UgaW5pdFdpdGhBY2Nlc3Np YmlsaXR5T2JqZWN0Ol0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UgYXR0YWNoSXNvbGF0ZWRPYmplY3Q6XSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGRldGFjaF0pOgorICAgICAgICAoLVtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBkZXRhY2hJc29sYXRlZE9iamVjdDpdKToKKyAgICAgICAgKC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVt ZW50XSk6IERlbGV0ZWQuCisKIDIwMjItMDMtMDggIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gU3luYyBndGstb3ZlcmxheS1zY3JvbGxp bmcgc2V0dGluZyB0byB3ZWIgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UuaAppbmRleCA4ZGMzNTM4MDgyYjcxZjY3M2Q3ZjJmNjQyNzA4ZTg0NGRjY2M3ZTAxLi5i YjI5ZThiZmExNTQ0ZTkxMTIyZGE2ZDJjOTUyNTc5ZGM1ODEwODZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckJhc2UuaApAQCAtNjMsOSArNjMsMTMgQEAgdm9pZCBBWEF0dHJp YnV0ZWRTdHJpbmdTZXRGb250KE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcgKiwgQ1RGb250UmVm LCBjb25zdCBOU1IKIAogQGludGVyZmFjZSBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJh c2UgOiBOU09iamVjdCB7CiAgICAgV2ViQ29yZTo6QVhDb3JlT2JqZWN0KiBtX2F4T2JqZWN0Owor CiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKICAgICBXZWJDb3JlOjpB WENvcmVPYmplY3QqIG1faXNvbGF0ZWRPYmplY3Q7CisgICAgLy8gVG8gYmUgYWNjZXNzZWQgb25s eSBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgYm9vbCBtX2lzb2xhdGVkT2JqZWN0SW5pdGlhbGl6 ZWQ7CiAjZW5kaWYKKwogICAgIFdlYkNvcmU6OkFYSUQgX2lkZW50aWZpZXI7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyQmFzZS5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5tbQppbmRleCA4NDdmYzA1ZjFmM2ZmMTFl MWEwYmYwODgwNWE1MTI3ZmNjZjJiMWZkLi5mMjljMjBjYmY5NDdiN2QxNzNjMWJjOWY3ZWMwYzcx ODRhNDIxZDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCkBA IC0yNzksOSArMjc5LDEwIEBAIE5TQXJyYXkgKm1ha2VOU0FycmF5KGNvbnN0IFdlYkNvcmU6OkFY Q29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBjCiAKIC0gKGlkKWluaXRX aXRoQWNjZXNzaWJpbGl0eU9iamVjdDooQVhDb3JlT2JqZWN0KilheE9iamVjdAogeworICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CisKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkK ICAgICAgICAgcmV0dXJuIG5pbDsKLQogICAgIFtzZWxmIGF0dGFjaEFYT2JqZWN0OmF4T2JqZWN0 XTsKICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTI5OSw2ICszMDAsOSBAQCBOU0FycmF5ICptYWtl TlNBcnJheShjb25zdCBXZWJDb3JlOjpBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgYwogewogICAgIEFTU0VSVChpc29sYXRlZE9iamVjdCAmJiAoIV9pZGVudGlmaWVy LmlzVmFsaWQoKSB8fCBfaWRlbnRpZmllciA9PSBpc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSkp OwogICAgIG1faXNvbGF0ZWRPYmplY3QgPSBpc29sYXRlZE9iamVjdDsKKyAgICBpZiAoaXNNYWlu VGhyZWFkKCkpCisgICAgICAgIG1faXNvbGF0ZWRPYmplY3RJbml0aWFsaXplZCA9IHRydWU7CisK ICAgICBpZiAoIV9pZGVudGlmaWVyLmlzVmFsaWQoKSkKICAgICAgICAgX2lkZW50aWZpZXIgPSBt X2lzb2xhdGVkT2JqZWN0LT5vYmplY3RJRCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0g Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlck1hYy5tbQppbmRleCA0OTA4YjBhNWE0NzNjNDdmMDUxM2YzYjM0MzE4MjQzYWUzNDUy NDJkLi5lZTk5MDA2MjkxZDMxOGQ1MjkzYWNjOTQ0OGQwNTc4MDYxYTRlNTQ3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtNTI0LDIxICs1MjQsMjggQEAgZXh0 ZXJuICJDIiBBWFVJRWxlbWVudFJlZiBOU0FjY2Vzc2liaWxpdHlDcmVhdGVBWFVJRWxlbWVudFJl ZihpZCBlbGVtZW50KTsKIAogQGltcGxlbWVudGF0aW9uIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyCiAKLS0gKHZvaWQpdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50CistICh2b2lk KWRldGFjaAogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgTlNBY2Nlc3NpYmls aXR5VW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVtZW50KHNlbGYpOworCisgICAgLy8gSWYgdGhl IElzb2xhdGVkT2JqZWN0IGlzIGluaXRpYWxpemVkLCBkbyBub3QgVW5yZWdpc3RlclVuaXF1ZUlk Rm9yVUlFbGVtZW50IGhlcmUgYmVjYXVzZSB0aGUgd3JhcHBlciBtYXkgYmUgaW4gdGhlIG1pZGRs ZSBvZiBzZXJ2aW5nIGEgcmVxdWVzdCBvbiB0aGUgQVggdGhyZWFkLgorICAgIC8vIFRoZSBJc29s YXRlZE9iamVjdCBpcyBjYXBhYmxlIHRvIHRlbmQgdG8gc29tZSByZXF1ZXN0cyBhZnRlciB0aGUg bGl2ZSBvYmplY3QgaXMgZ29uZS4KKyAgICAvLyBJbiByZWd1bGFyIG1vZGUsIFVucmVnaXN0ZXJV bmlxdWVJZEZvclVJRWxlbWVudCBpbW1lZGlhdGVseS4KKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElU WV9JU09MQVRFRF9UUkVFKQorICAgIGlmICghbV9pc29sYXRlZE9iamVjdEluaXRpYWxpemVkKQor I2VuZGlmCisgICAgICAgIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJZEZvclVJRWxl bWVudChzZWxmKTsKKworICAgIFtzdXBlciBkZXRhY2hdOwogfQogCi0tICh2b2lkKWRldGFjaAor I2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCistICh2b2lkKWRldGFjaElz b2xhdGVkT2JqZWN0OihBY2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUpZGV0YWNobWVudFR5cGUK IHsKLSAgICAvLyBTZW5kIHVucmVnaXN0ZXJVbmlxdWVJZEZvclVJRWxlbWVudCB1bmNvbmRpdGlv bmFsbHkgYmVjYXVzZSBpZiBpdCBpcwotICAgIC8vIGV2ZXIgYWNjaWRlbnRhbGx5IG5vdCBkb25l ICh2aWEgb3RoZXIgYnVncyBpbiBvdXIgQVggaW1wbGVtZW50YXRpb24pIHlvdQotICAgIC8vIGVu ZCB1cCB3aXRoIGEgY3Jhc2ggbGlrZSA8cmRhcjovL3Byb2JsZW0vNDI3MzE0OT4uICBJdCBpcyBz YWZlIGFuZCBub3QKLSAgICAvLyBleHBlbnNpdmUgdG8gc2VuZCBldmVuIGlmIHRoZSBvYmplY3Qg aXMgbm90IHJlZ2lzdGVyZWQuCi0gICAgW3NlbGYgdW5yZWdpc3RlclVuaXF1ZUlkRm9yVUlFbGVt ZW50XTsKLSAgICBbc3VwZXIgZGV0YWNoXTsKKyAgICBOU0FjY2Vzc2liaWxpdHlVbnJlZ2lzdGVy VW5pcXVlSWRGb3JVSUVsZW1lbnQoc2VsZik7CisgICAgW3N1cGVyIGRldGFjaElzb2xhdGVkT2Jq ZWN0OmRldGFjaG1lbnRUeXBlXTsKIH0KKyNlbmRpZgogCiAtIChpZClhdHRhY2htZW50Vmlldwog ewo=