265470 2023-11-28 11:50:18 -0800 AX: accessing WeakPtr from wrong thread with embedded PDF 2023-12-06 11:31:38 -0800 1 1 1 Unclassified WebKit Accessibility Safari Technology Preview All macOS 14 RESOLVED FIXED InRadar P2 Normal --- 1 dm_mazzoni webkit-unassigned andresg_22 cfleizach webkit-bug-importer oldest_to_newest 1995367 0 dm_mazzoni 2023-11-28 11:50:18 -0800 You can repro with a trivially simple HTML page that embeds a PDF, e.g.: <object data="hello.pdf" type="application/pdf" width="300" height="300"></object> Open the web page and enable VoiceOver, then try to navigate to the embedded PDF object - I get this assertion in debug mode: ASSERTION FAILED: canSafelyBeUsed() include/wtf/WeakPtr.h(138) : T *WTF::WeakPtr<WebKit::WebFrame>::operator->() const [T = WebKit::WebFrame, WeakPtrImpl = WTF::DefaultWeakPtrImpl] 1 WTFCrash 2 WTFCrashWithInfo(int, char const*, char const*, int) 3 WTF::WeakPtr<WebKit::WebFrame, WTF::DefaultWeakPtrImpl>::operator->() const 4 WebKit::PDFPlugin::axObjectCache() const 5 -[WKPDFPluginAccessibilityObject parent] 6 -[WKPDFPluginAccessibilityObject accessibilityAttributeValue:] 7 NSAccessibilityGetObjectForAttributeUsingLegacyAPI 1995368 1 webkit-bug-importer 2023-11-28 11:50:27 -0800 <rdar://problem/118892293> 1995380 2 468788 dm_mazzoni 2023-11-28 12:51:00 -0800 Created attachment 468788 Patch 1995382 3 468788 cfleizach 2023-11-28 13:01:14 -0800 Comment on attachment 468788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=468788&action=review > Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm:194 > + callOnMainRunLoopAndWait([&] { if we don't do this is it a crash? also returning and storing an ivar (_parent) on a different thread might be bad 1995383 4 468789 dm_mazzoni 2023-11-28 13:24:58 -0800 Created attachment 468789 Patch 1995384 5 dm_mazzoni 2023-11-28 13:26:39 -0800 (In reply to chris fleizach from comment #3) > if we don't do this is it a crash? It's a debug assertion in WeakPtr: canSafelyBeUsed > also returning and storing an ivar (_parent) on a different thread might be > bad Got it, changed to use a local RetainPtr to move between threads 1995385 6 468790 dm_mazzoni 2023-11-28 13:27:58 -0800 Created attachment 468790 Patch 1995402 7 andresg_22 2023-11-28 14:35:17 -0800 (In reply to Dominic Mazzoni from comment #6) > Created attachment 468790 [details] > Patch Use the main thread when accessing the document's axObjectCache from WKPDFPluginAccessibilityObject https://bugs.webkit.org/show_bug.cgi?id=265470 rdar://118894435 Reviewed by NOBODY (OOPS!). AG: Include here a brief explanation of the problem and solution. * Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm: (-[WKPDFPluginAccessibilityObject parent]): (WebKit::PDFPlugin::axObjectCache const): --- Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm index 4fc440c1fe89..fb77b90b95f6 100644 --- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm +++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm @@ -191,10 +191,14 @@ - (id)initWithPDFPlugin:(WebKit::PDFPlugin *)plugin andElement:(WebCore::HTMLPlu - (NSObject *)parent { if (!_parent) { - if (auto* axObjectCache = _pdfPlugin->axObjectCache()) { - if (RefPtr pluginAxObject = axObjectCache->getOrCreate(_pluginElement.get())) - _parent = pluginAxObject->wrapper(); - } + RetainPtr<NSObject> parent; + callOnMainRunLoopAndWait([&] { AG: I think you need to capture a strong reference to self because there is no guaranty that self is alive when the lambda is invoked on the main thread, similar to what we do in WebAccessibilityObjectWrapper. I.e., something like: callOnMainRunLoopAndWait([&parent, protectedSelf = retainPtr(self)] { and then use protectedSelf to access properties and methods in the lambda. + if (auto* axObjectCache = _pdfPlugin->axObjectCache()) { + if (RefPtr pluginAxObject = axObjectCache->getOrCreate(_pluginElement.get())) + parent = pluginAxObject->wrapper(); + } + }); + _parent = parent.get(); } return _parent.get().get(); } 1995692 8 468810 dm_mazzoni 2023-11-29 12:53:46 -0800 Created attachment 468810 Patch 1995697 9 dm_mazzoni 2023-11-29 12:55:54 -0800 (In reply to Andres Gonzalez from comment #7) > AG: I think you need to capture a strong reference to self because there is > no guaranty that self is alive when the lambda is invoked on the main > thread, similar to what we do in WebAccessibilityObjectWrapper. I.e., Thanks. Notice that the function accesses an ivar at the bottom - so I think it's actually necessary to retain self throughout the whole function scope, not just the lambda. Let me know if you disagree. 1997449 10 ews-feeder 2023-12-06 11:31:18 -0800 Committed 271622@main (0cab9f4dd652): <https://commits.webkit.org/271622@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468810. 468788 2023-11-28 12:51:00 -0800 2023-11-28 13:24:56 -0800 Patch bug-265470-20231128125059.patch text/plain 1599 dm_mazzoni RnJvbSA0NWYyMjE1MWJmNmFlZGRmMmJkNDkwMTYzZjBlNGNkNDYyZDg4MGFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDI4IE5vdiAyMDIzIDEyOjE1OjU0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VXNlIHRoZSBtYWluIHRocmVhZCB3aGVuIGFjY2Vzc2luZyB0aGUgZG9jdW1lbnQncwogYXhPYmpl Y3RDYWNoZSBmcm9tIFdLUERGUGx1Z2luQWNjZXNzaWJpbGl0eU9iamVjdAoKaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTQ3MApyZGFyOi8vMTE4ODk0NDM1CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5tbToKKC1bV0tQREZQbHVnaW5BY2Nlc3NpYmlsaXR5T2JqZWN0IHBh cmVudF0pOgooV2ViS2l0OjpQREZQbHVnaW46OmF4T2JqZWN0Q2FjaGUgY29uc3QpOgotLS0KIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gfCAxMCArKysr KystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVn aW4ubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1t CmluZGV4IDRmYzQ0MGMxZmU4OS4uNGNjY2Q5NzE5Y2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KQEAgLTE5MSwxMCArMTkxLDEy IEBAIC0gKGlkKWluaXRXaXRoUERGUGx1Z2luOihXZWJLaXQ6OlBERlBsdWdpbiAqKXBsdWdpbiBh bmRFbGVtZW50OihXZWJDb3JlOjpIVE1MUGx1CiAtIChOU09iamVjdCAqKXBhcmVudAogewogICAg IGlmICghX3BhcmVudCkgewotICAgICAgICBpZiAoYXV0byogYXhPYmplY3RDYWNoZSA9IF9wZGZQ bHVnaW4tPmF4T2JqZWN0Q2FjaGUoKSkgewotICAgICAgICAgICAgaWYgKFJlZlB0ciBwbHVnaW5B eE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKF9wbHVnaW5FbGVtZW50LmdldCgp KSkKLSAgICAgICAgICAgICAgICBfcGFyZW50ID0gcGx1Z2luQXhPYmplY3QtPndyYXBwZXIoKTsK LSAgICAgICAgfQorICAgICAgICBjYWxsT25NYWluUnVuTG9vcEFuZFdhaXQoWyZdIHsKKyAgICAg ICAgICAgIGlmIChhdXRvKiBheE9iamVjdENhY2hlID0gX3BkZlBsdWdpbi0+YXhPYmplY3RDYWNo ZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKFJlZlB0ciBwbHVnaW5BeE9iamVjdCA9IGF4T2Jq ZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKF9wbHVnaW5FbGVtZW50LmdldCgpKSkKKyAgICAgICAgICAg ICAgICAgICAgX3BhcmVudCA9IHBsdWdpbkF4T2JqZWN0LT53cmFwcGVyKCk7CisgICAgICAgICAg ICB9CisgICAgICAgIH0pOwogICAgIH0KICAgICByZXR1cm4gX3BhcmVudC5nZXQoKS5nZXQoKTsK IH0K 468789 2023-11-28 13:24:58 -0800 2023-11-28 13:27:56 -0800 Patch bug-265470-20231128132457.patch text/plain 2601 dm_mazzoni RnJvbSBlOThjMzE2Y2VmM2JlMDQ2YjViYTZlNDE3MWJhZmJmM2UyOTQxZTUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDI4IE5vdiAyMDIzIDEyOjE1OjU0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VXNlIHRoZSBtYWluIHRocmVhZCB3aGVuIGFjY2Vzc2luZyB0aGUgZG9jdW1lbnQncwogYXhPYmpl Y3RDYWNoZSBmcm9tIFdLUERGUGx1Z2luQWNjZXNzaWJpbGl0eU9iamVjdAoKaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTQ3MApyZGFyOi8vMTE4ODk0NDM1CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5tbToKKC1bV0tQREZQbHVnaW5BY2Nlc3NpYmlsaXR5T2JqZWN0IHBh cmVudF0pOgooV2ViS2l0OjpQREZQbHVnaW46OmF4T2JqZWN0Q2FjaGUgY29uc3QpOgotLS0KIC4u Li9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXIuY3BwICAgICAgICAgICAgfCAgMiAr LQogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSAgICB8 IDEyICsrKysrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5j cHAKaW5kZXggMzRmYmZjYzliOTVkLi4zYjkyOGRmYThiMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFu YWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0Nv cmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcApAQCAtMTE2LDcgKzExNiw3IEBAIHN0YXRp YyBib29sIGlzVmFsaWRDYXB0dXJlRGV2aWNlKGNvbnN0IENvcmVBdWRpb0NhcHR1cmVEZXZpY2Um IGRldmljZSwgYm9vbCBmaWx0CiAgICAgaWYgKGZpbHRlclRhcEVuYWJsZWREZXZpY2VzKSB7CiAg ICAgICAgIC8vIElnbm9yZSBvdXRwdXQgZGV2aWNlcyB0aGF0IGhhdmUgaW5wdXQgb25seSBmb3Ig ZWNobyBjYW5jZWxsYXRpb24uCiAgICAgICAgIEF1ZGlvT2JqZWN0UHJvcGVydHlBZGRyZXNzIGFk ZHJlc3MgPSB7Ci0gICAgICAgICAgICBrQXVkaW9EZXZpY2VQcm9wZXJ0eVRhcEVuYWJsZWQsCisg ICAgICAgICAgICBrQXVkaW9EZXZpY2VQcm9wZXJ0eVJlZmVyZW5jZVN0cmVhbUVuYWJsZWQsCiAg ICAgICAgICAgICBrQXVkaW9EZXZpY2VQcm9wZXJ0eVNjb3BlT3V0cHV0LAogI2lmIEhBVkUoQVVE SU9fT0JKRUNUX1BST1BFUlRZX0VMRU1FTlRfTUFJTikKICAgICAgICAgICAgIGtBdWRpb09iamVj dFByb3BlcnR5RWxlbWVudE1haW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1 Z2lucy9QREYvUERGUGx1Z2luLm1tCmluZGV4IDRmYzQ0MGMxZmU4OS4uZmI3N2I5MGI5NWY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2lu Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4u bW0KQEAgLTE5MSwxMCArMTkxLDE0IEBAIC0gKGlkKWluaXRXaXRoUERGUGx1Z2luOihXZWJLaXQ6 OlBERlBsdWdpbiAqKXBsdWdpbiBhbmRFbGVtZW50OihXZWJDb3JlOjpIVE1MUGx1CiAtIChOU09i amVjdCAqKXBhcmVudAogewogICAgIGlmICghX3BhcmVudCkgewotICAgICAgICBpZiAoYXV0byog YXhPYmplY3RDYWNoZSA9IF9wZGZQbHVnaW4tPmF4T2JqZWN0Q2FjaGUoKSkgewotICAgICAgICAg ICAgaWYgKFJlZlB0ciBwbHVnaW5BeE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRl KF9wbHVnaW5FbGVtZW50LmdldCgpKSkKLSAgICAgICAgICAgICAgICBfcGFyZW50ID0gcGx1Z2lu QXhPYmplY3QtPndyYXBwZXIoKTsKLSAgICAgICAgfQorICAgICAgICBSZXRhaW5QdHI8TlNPYmpl Y3Q+IHBhcmVudDsKKyAgICAgICAgY2FsbE9uTWFpblJ1bkxvb3BBbmRXYWl0KFsmXSB7CisgICAg ICAgICAgICBpZiAoYXV0byogYXhPYmplY3RDYWNoZSA9IF9wZGZQbHVnaW4tPmF4T2JqZWN0Q2Fj aGUoKSkgeworICAgICAgICAgICAgICAgIGlmIChSZWZQdHIgcGx1Z2luQXhPYmplY3QgPSBheE9i amVjdENhY2hlLT5nZXRPckNyZWF0ZShfcGx1Z2luRWxlbWVudC5nZXQoKSkpCisgICAgICAgICAg ICAgICAgICAgIHBhcmVudCA9IHBsdWdpbkF4T2JqZWN0LT53cmFwcGVyKCk7CisgICAgICAgICAg ICB9CisgICAgICAgIH0pOworICAgICAgICBfcGFyZW50ID0gcGFyZW50LmdldCgpOwogICAgIH0K ICAgICByZXR1cm4gX3BhcmVudC5nZXQoKS5nZXQoKTsKIH0K 468790 2023-11-28 13:27:58 -0800 2023-11-29 12:53:43 -0800 Patch bug-265470-20231128132758.patch text/plain 1670 dm_mazzoni RnJvbSBhMGIyZGExMjcwNGYxM2JmYTczYmRiZDQwNzljYTFhNTBlZjIxYTkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDI4IE5vdiAyMDIzIDEyOjE1OjU0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VXNlIHRoZSBtYWluIHRocmVhZCB3aGVuIGFjY2Vzc2luZyB0aGUgZG9jdW1lbnQncwogYXhPYmpl Y3RDYWNoZSBmcm9tIFdLUERGUGx1Z2luQWNjZXNzaWJpbGl0eU9iamVjdAoKaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTQ3MApyZGFyOi8vMTE4ODk0NDM1CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5tbToKKC1bV0tQREZQbHVnaW5BY2Nlc3NpYmlsaXR5T2JqZWN0IHBh cmVudF0pOgooV2ViS2l0OjpQREZQbHVnaW46OmF4T2JqZWN0Q2FjaGUgY29uc3QpOgotLS0KIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gfCAxMiArKysr KysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4u bW0KaW5kZXggNGZjNDQwYzFmZTg5Li5mYjc3YjkwYjk1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQpAQCAtMTkxLDEwICsxOTEs MTQgQEAgLSAoaWQpaW5pdFdpdGhQREZQbHVnaW46KFdlYktpdDo6UERGUGx1Z2luICopcGx1Z2lu IGFuZEVsZW1lbnQ6KFdlYkNvcmU6OkhUTUxQbHUKIC0gKE5TT2JqZWN0ICopcGFyZW50CiB7CiAg ICAgaWYgKCFfcGFyZW50KSB7Ci0gICAgICAgIGlmIChhdXRvKiBheE9iamVjdENhY2hlID0gX3Bk ZlBsdWdpbi0+YXhPYmplY3RDYWNoZSgpKSB7Ci0gICAgICAgICAgICBpZiAoUmVmUHRyIHBsdWdp bkF4T2JqZWN0ID0gYXhPYmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUoX3BsdWdpbkVsZW1lbnQuZ2V0 KCkpKQotICAgICAgICAgICAgICAgIF9wYXJlbnQgPSBwbHVnaW5BeE9iamVjdC0+d3JhcHBlcigp OwotICAgICAgICB9CisgICAgICAgIFJldGFpblB0cjxOU09iamVjdD4gcGFyZW50OworICAgICAg ICBjYWxsT25NYWluUnVuTG9vcEFuZFdhaXQoWyZdIHsKKyAgICAgICAgICAgIGlmIChhdXRvKiBh eE9iamVjdENhY2hlID0gX3BkZlBsdWdpbi0+YXhPYmplY3RDYWNoZSgpKSB7CisgICAgICAgICAg ICAgICAgaWYgKFJlZlB0ciBwbHVnaW5BeE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUtPmdldE9yQ3Jl YXRlKF9wbHVnaW5FbGVtZW50LmdldCgpKSkKKyAgICAgICAgICAgICAgICAgICAgcGFyZW50ID0g cGx1Z2luQXhPYmplY3QtPndyYXBwZXIoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSk7Cisg ICAgICAgIF9wYXJlbnQgPSBwYXJlbnQuZ2V0KCk7CiAgICAgfQogICAgIHJldHVybiBfcGFyZW50 LmdldCgpLmdldCgpOwogfQo= 468810 2023-11-29 12:53:46 -0800 2023-12-06 11:31:26 -0800 Patch bug-265470-20231129125345.patch text/plain 2275 dm_mazzoni RnJvbSBlOGEwOGJjMGQ5MTVjZjM1ODE5ZWRkODAyZGRmODc1ZTgwZWVjN2ViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDI4IE5vdiAyMDIzIDEyOjE1OjU0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VXNlIHRoZSBtYWluIHRocmVhZCB3aGVuIGFjY2Vzc2luZyB0aGUgZG9jdW1lbnQncwogYXhPYmpl Y3RDYWNoZSBmcm9tIFdLUERGUGx1Z2luQWNjZXNzaWJpbGl0eU9iamVjdAoKaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2NTQ3MApyZGFyOi8vMTE4ODk0NDM1CgpSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCldLUERGUGx1Z2luQWNjZXNzaWJpbGl0eU9iamVjdC5w YXJlbnQgd2FzIGFjY2Vzc2luZyB0aGUgcGRmIHBsdWdpbidzIGF4T2JqZWN0Q2FjaGUsCndoaWNo IHJlcXVpcmVkIGFjY2Vzc2luZyBhIHdlYWsgcG9pbnRlciB0aGF0IGNhbid0IGJlIHNhZmVseSB1 c2VkIG9mZiB0aGUgbWFpbgp0aHJlYWQuIEZpeCBpdCBieSBjb21wdXRpbmcgdGhlIHBhcmVudCBv biB0aGUgbWFpbiB0aHJlYWQgaW5zdGVhZC4KCkJlY2F1c2UgdGhlIGZ1bmN0aW9uIHJldHVybnMg YW4gaXZhciBhZnRlciB0aGUgY2FsbCB0byB0aGUgbWFpbiB0aHJlYWQsCml0J3MgbmVjZXNzYXJ5 IHRvIHByb3RlY3QgInNlbGYiIHRocm91Z2ggdGhlIHNjb3BlIG9mIHRoZSB3aG9sZSBmdW5jdGlv biBjYWxsLApub3QganVzdCBpbiB0aGUgbGFtYmRhLgoKKiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tOgooLVtXS1BERlBsdWdpbkFjY2Vzc2liaWxpdHlP YmplY3QgcGFyZW50XSk6CihXZWJLaXQ6OlBERlBsdWdpbjo6YXhPYmplY3RDYWNoZSBjb25zdCk6 Ci0tLQogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSB8 IDE1ICsrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lu cy9QREYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERG L1BERlBsdWdpbi5tbQppbmRleCA0ZmM0NDBjMWZlODkuLjY0YmEyNWZiOWQ4ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCkBAIC0x OTAsMTMgKzE5MCwxNiBAQCAtIChpZClpbml0V2l0aFBERlBsdWdpbjooV2ViS2l0OjpQREZQbHVn aW4gKilwbHVnaW4gYW5kRWxlbWVudDooV2ViQ29yZTo6SFRNTFBsdQogCiAtIChOU09iamVjdCAq KXBhcmVudAogewotICAgIGlmICghX3BhcmVudCkgewotICAgICAgICBpZiAoYXV0byogYXhPYmpl Y3RDYWNoZSA9IF9wZGZQbHVnaW4tPmF4T2JqZWN0Q2FjaGUoKSkgewotICAgICAgICAgICAgaWYg KFJlZlB0ciBwbHVnaW5BeE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKF9wbHVn aW5FbGVtZW50LmdldCgpKSkKLSAgICAgICAgICAgICAgICBfcGFyZW50ID0gcGx1Z2luQXhPYmpl Y3QtPndyYXBwZXIoKTsKLSAgICAgICAgfQorICAgIFJldGFpblB0cjxXS1BERlBsdWdpbkFjY2Vz c2liaWxpdHlPYmplY3Q+IHByb3RlY3RlZFNlbGYgPSByZXRhaW5QdHIoc2VsZik7CisgICAgaWYg KCFwcm90ZWN0ZWRTZWxmLT5fcGFyZW50KSB7CisgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wQW5k V2FpdChbJnByb3RlY3RlZFNlbGZdIHsKKyAgICAgICAgICAgIGlmIChhdXRvKiBheE9iamVjdENh Y2hlID0gcHJvdGVjdGVkU2VsZi0+X3BkZlBsdWdpbi0+YXhPYmplY3RDYWNoZSgpKSB7CisgICAg ICAgICAgICAgICAgaWYgKFJlZlB0ciBwbHVnaW5BeE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUtPmdl dE9yQ3JlYXRlKHByb3RlY3RlZFNlbGYtPl9wbHVnaW5FbGVtZW50LmdldCgpKSkKKyAgICAgICAg ICAgICAgICAgICAgcHJvdGVjdGVkU2VsZi0+X3BhcmVudCA9IHBsdWdpbkF4T2JqZWN0LT53cmFw cGVyKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0pOwogICAgIH0KLSAgICByZXR1cm4gX3Bh cmVudC5nZXQoKS5nZXQoKTsKKyAgICByZXR1cm4gcHJvdGVjdGVkU2VsZi0+X3BhcmVudC5nZXQo KS5nZXQoKTsKIH0KIAogLSAodm9pZClzZXRQYXJlbnQ6KE5TT2JqZWN0ICopcGFyZW50Cg==