194632 2019-02-13 17:54:58 -0800 Web Inspector: Crash when inspecting an element that constantly changes visibility 2019-02-13 20:45:47 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1505987 0 joepeck 2019-02-13 17:54:58 -0800 Crash when inspecting an element that constantly changes visibility Test: <div id="box"></div> <script> setInterval(function() { box.hidden = !box.hidden; }, 50); </script> Steps to Reproduce: 1. Inspect test page 2. Select the <div id="box"> in the Elements tab => Page crashes Crash: Crashed Thread: 0 Dispatch queue: com.apple.main-thread Exception Type: EXC_BAD_INSTRUCTION (SIGILL) Exception Codes: 0x0000000000000001, 0x0000000000000000 Exception Note: EXC_CORPSE_NOTIFY Application Specific Information: Pure virtual function called! abort() called Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 libsystem_c.dylib 0x00007fff608df766 __abort + 177 1 libsystem_c.dylib 0x00007fff608df6b5 abort + 142 2 libc++abi.dylib 0x00007fff5d98b641 abort_message + 231 3 libc++abi.dylib 0x00007fff5d997ad2 __cxa_pure_virtual + 18 4 com.apple.WebCore 0x0000000491d8feff WebCore::AccessibilityObject::matchedParent(WebCore::AccessibilityObject const&, bool, WTF::Function<bool (WebCore::AccessibilityObject const&)> const&) + 63 (AccessibilityObject.cpp:1901) 5 com.apple.WebCore 0x0000000491d94e73 WebCore::AccessibilityObject::parentObjectUnignored() const + 51 (AccessibilityObject.cpp:468) 6 com.apple.WebCore 0x0000000492a6b0da WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties(WebCore::Node*) + 3642 (InspectorDOMAgent.cpp:1956) 7 com.apple.WebCore 0x0000000492a6a273 WebCore::InspectorDOMAgent::getAccessibilityPropertiesForNode(WTF::String&, int, WTF::RefPtr<Inspector::Protocol::DOM::AccessibilityProperties, WTF::DumbPtrTraits<Inspector::Protocol::DOM::AccessibilityProperties> >&) + 83 (InspectorDOMAgent.cpp:995) 8 com.apple.JavaScriptCore 0x00000004a7395582 Inspector::DOMBackendDispatcher::getAccessibilityPropertiesForNode(long, WTF::RefPtr<WTF::JSONImpl::Object, WTF::DumbPtrTraits<WTF::JSONImpl::Object> >&&) + 418 (InspectorBackendDispatchers.cpp:1920) 9 com.apple.JavaScriptCore 0x00000004a739249b Inspector::DOMBackendDispatcher::dispatch(long, WTF::String const&, WTF::Ref<WTF::JSONImpl::Object, WTF::DumbPtrTraits<WTF::JSONImpl::Object> >&&) + 891 (InspectorBackendDispatchers.cpp:1496) 10 com.apple.JavaScriptCore 0x00000004a73854fb Inspector::BackendDispatcher::dispatch(WTF::String const&) + 1883 (InspectorBackendDispatcher.cpp:180) 11 com.apple.WebCore 0x00000004929f728c WebCore::InspectorController::dispatchMessageFromFrontend(WTF::String const&) + 44 (InspectorController.cpp:426) 12 com.apple.WebKit 0x000000010fe5a90c WebKit::WebPageInspectorTarget::sendMessageToTargetBackend(WTF::String const&) + 76 (WebPageInspectorTarget.cpp:63) ... 1505989 1 361978 joepeck 2019-02-13 17:56:46 -0800 Created attachment 361978 [PATCH] Proposed Fix 1505990 2 webkit-bug-importer 2019-02-13 17:58:53 -0800 <rdar://problem/48060258> 1505994 3 361978 mattbaker 2019-02-13 18:17:44 -0800 Comment on attachment 361978 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=361978&action=review r=me > Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:1746 > +void InspectorDOMAgent::processAccessibilityChildren(AccessibilityObject& axObject, JSON::ArrayOf<int>& childNodeIds) This can be const AccessibilityObject&, since the children method is const. 1506004 4 361978 joepeck 2019-02-13 18:56:31 -0800 Comment on attachment 361978 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=361978&action=review >> Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:1746 >> +void InspectorDOMAgent::processAccessibilityChildren(AccessibilityObject& axObject, JSON::ArrayOf<int>& childNodeIds) > > This can be const AccessibilityObject&, since the children method is const. In this case it surprisingly is not const: const AccessibilityChildrenVector& children(bool updateChildrenIfNeeded = true); 1506006 5 361978 hi 2019-02-13 18:58:54 -0800 Comment on attachment 361978 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=361978&action=review r=me (as well), nice fix :) I refactored a lot of this code when building `InspectorAuditAccessibilityObject`, so you could copy/merge much of this code if you wanted to change anything else :P > Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:1834 > + processAccessibilityChildren(*axObject, *childNodeIds.get()); Could you just use `*childNodeIds`? 1506008 6 361983 joepeck 2019-02-13 19:00:52 -0800 Created attachment 361983 [PATCH] For Landing 1506020 7 361983 commit-queue 2019-02-13 19:38:45 -0800 Comment on attachment 361983 [PATCH] For Landing Clearing flags on attachment: 361983 Committed r241495: <https://trac.webkit.org/changeset/241495> 1506031 8 mattbaker 2019-02-13 20:45:47 -0800 (In reply to Joseph Pecoraro from comment #4) > Comment on attachment 361978 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=361978&action=review > > >> Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:1746 > >> +void InspectorDOMAgent::processAccessibilityChildren(AccessibilityObject& axObject, JSON::ArrayOf<int>& childNodeIds) > > > > This can be const AccessibilityObject&, since the children method is const. > > In this case it surprisingly is not const: > > const AccessibilityChildrenVector& children(bool updateChildrenIfNeeded = > true); Oops, I saw the const return value and my eyes played tricks on me. 361978 2019-02-13 17:56:46 -0800 2019-02-13 18:56:31 -0800 [PATCH] Proposed Fix ax-1.patch text/plain 4117 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmOTNmN2M0YWQyZC4uYThjNzYxMDVlYjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wMi0xMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyYXNoIHdoZW4gaW5zcGVjdGluZyBhbiBl bGVtZW50IHRoYXQgY29uc3RhbnRseSBjaGFuZ2VzIHZpc2liaWxpdHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDYzMgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JET01BZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9N QWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NB Y2Nlc3NpYmlsaXR5Q2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdl bnQ6OmJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0eVByb3BlcnRpZXMpOgorICAgICAgICBEb24n dCB1c2UgcnZhbHVlLXJlZmVyZW5jZXMgYXMgdGhhdCB3YXMgdGFraW5nIG93bmVyc2hpcCBhbmQg ZGVsZXRpbmcKKyAgICAgICAgdGhlIG9iamVjdCB3ZSB3YW50IHRvIGtlZXAgYXJvdW5kLiBJbnN0 ZWFkIHNpbXBsaWZ5IHRoaXMgdG8ganVzdCB1c2UKKyAgICAgICAgcmVmZXJlbmNlcyBzbyBubyBy ZWYgY291bnRpbmcgY2hhbmdlcyBoYXBwZW4uCisKIDIwMTktMDItMTIgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBCZXR0ZXIg Y2F0ZWdvcml6ZSBDUFUgdXNhZ2UgcGVyLXRocmVhZCAvIHdvcmtlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAz NTM2ZDc4ZWMwZi4uYmRlMTE0YzA3ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xNzQyLDIxICsxNzQyLDE4 IEBAIFJlZjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006OkV2ZW50TGlzdGVuZXI+IEluc3BlY3Rv ckRPTUFnZW50OjpidWlsZE9iamVjdEZvckV2CiAgICAgICAgIHZhbHVlLT5zZXRIYXNCcmVha3Bv aW50KGhhc0JyZWFrcG9pbnQpOwogICAgIHJldHVybiB2YWx1ZTsKIH0KLSAgICAKLXZvaWQgSW5z cGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVmUHRyPEFjY2Vz c2liaWxpdHlPYmplY3Q+JiYgYXhPYmplY3QsIFJlZlB0cjxKU09OOjpBcnJheU9mPGludD4+JiYg Y2hpbGROb2RlSWRzKQorCit2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpwcm9jZXNzQWNjZXNzaWJp bGl0eUNoaWxkcmVuKEFjY2Vzc2liaWxpdHlPYmplY3QmIGF4T2JqZWN0LCBKU09OOjpBcnJheU9m PGludD4mIGNoaWxkTm9kZUlkcykKIHsKLSAgICBjb25zdCBhdXRvJiBjaGlsZHJlbiA9IGF4T2Jq ZWN0LT5jaGlsZHJlbigpOworICAgIGNvbnN0IGF1dG8mIGNoaWxkcmVuID0gYXhPYmplY3QuY2hp bGRyZW4oKTsKICAgICBpZiAoIWNoaWxkcmVuLnNpemUoKSkKICAgICAgICAgcmV0dXJuOwotICAg IAotICAgIGlmICghY2hpbGROb2RlSWRzKQotICAgICAgICBjaGlsZE5vZGVJZHMgPSBKU09OOjpB cnJheU9mPGludD46OmNyZWF0ZSgpOwotICAgIAorCiAgICAgZm9yIChjb25zdCBhdXRvJiBjaGls ZE9iamVjdCA6IGNoaWxkcmVuKSB7CiAgICAgICAgIGlmIChOb2RlKiBjaGlsZE5vZGUgPSBjaGls ZE9iamVjdC0+bm9kZSgpKQotICAgICAgICAgICAgY2hpbGROb2RlSWRzLT5hZGRJdGVtKHB1c2hO b2RlUGF0aFRvRnJvbnRlbmQoY2hpbGROb2RlKSk7CisgICAgICAgICAgICBjaGlsZE5vZGVJZHMu YWRkSXRlbShwdXNoTm9kZVBhdGhUb0Zyb250ZW5kKGNoaWxkTm9kZSkpOwogICAgICAgICBlbHNl Ci0gICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGNoaWxkT2JqZWN0LmNv cHlSZWYoKSwgY2hpbGROb2RlSWRzLmNvcHlSZWYoKSk7CisgICAgICAgICAgICBwcm9jZXNzQWNj ZXNzaWJpbGl0eUNoaWxkcmVuKCpjaGlsZE9iamVjdCwgY2hpbGROb2RlSWRzKTsKICAgICB9CiB9 CiAgICAgCkBAIC0xODMyLDcgKzE4MjksMTAgQEAgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6 OkRPTTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM+IEluc3BlY3RvckRPTUFnZW50OjpidWkKICAg ICAgICAgICAgICAgICAgICAgY2hlY2tlZCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6QWNj ZXNzaWJpbGl0eVByb3BlcnRpZXM6OkNoZWNrZWQ6OlRydWU7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAKLSAgICAgICAgICAgIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oYXhPYmpl Y3QsIFdURk1vdmUoY2hpbGROb2RlSWRzKSk7CisgICAgICAgICAgICBpZiAoIWF4T2JqZWN0LT5j aGlsZHJlbigpLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIGNoaWxkTm9kZUlkcyA9IEpT T046OkFycmF5T2Y8aW50Pjo6Y3JlYXRlKCk7CisgICAgICAgICAgICAgICAgcHJvY2Vzc0FjY2Vz c2liaWxpdHlDaGlsZHJlbigqYXhPYmplY3QsICpjaGlsZE5vZGVJZHMuZ2V0KCkpOworICAgICAg ICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGNvbnRy b2xsZWRFbGVtZW50czsKICAgICAgICAgICAgIGF4T2JqZWN0LT5lbGVtZW50c0Zyb21BdHRyaWJ1 dGUoY29udHJvbGxlZEVsZW1lbnRzLCBhcmlhX2NvbnRyb2xzQXR0cik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXggMjBh YjNkNTA2YTYuLmRmMWVlZGNhZjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5oCkBAIC0yNDgsNyArMjQ4LDcgQEAgcHJpdmF0 ZToKICAgICBSZWZQdHI8SlNPTjo6QXJyYXlPZjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006Ok5v ZGU+PiBidWlsZEFycmF5Rm9yUHNldWRvRWxlbWVudHMoY29uc3QgRWxlbWVudCYsIE5vZGVUb0lk TWFwKiBub2Rlc01hcCk7CiAgICAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6RXZlbnRM aXN0ZW5lcj4gYnVpbGRPYmplY3RGb3JFdmVudExpc3RlbmVyKGNvbnN0IFJlZ2lzdGVyZWRFdmVu dExpc3RlbmVyJiwgaW50IGlkZW50aWZpZXIsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBl LCBOb2RlKiwgY29uc3QgU3RyaW5nKiBvYmplY3RHcm91cElkLCBib29sIGRpc2FibGVkLCBib29s IGhhc0JyZWFrcG9pbnQpOwogICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006OkFj Y2Vzc2liaWxpdHlQcm9wZXJ0aWVzPiBidWlsZE9iamVjdEZvckFjY2Vzc2liaWxpdHlQcm9wZXJ0 aWVzKE5vZGUqKTsKLSAgICB2b2lkIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVmUHRy PEFjY2Vzc2liaWxpdHlPYmplY3Q+JiYsIFJlZlB0cjxKU09OOjpBcnJheU9mPGludD4+JiYpOwor ICAgIHZvaWQgcHJvY2Vzc0FjY2Vzc2liaWxpdHlDaGlsZHJlbihBY2Nlc3NpYmlsaXR5T2JqZWN0 JiwgSlNPTjo6QXJyYXlPZjxpbnQ+Jik7CiAgICAgCiAgICAgTm9kZSogbm9kZUZvclBhdGgoY29u c3QgU3RyaW5nJiBwYXRoKTsKICAgICBOb2RlKiBub2RlRm9yT2JqZWN0SWQoY29uc3QgU3RyaW5n JiBvYmplY3RJZCk7Cg== 361983 2019-02-13 19:00:52 -0800 2019-02-13 19:38:45 -0800 [PATCH] For Landing for-landing-1.patch text/plain 4159 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmOTNmN2M0YWQyZC4uNjUwZTBiNDNkNTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOS0wMi0xMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyYXNoIHdoZW4gaW5zcGVjdGluZyBhbiBl bGVtZW50IHRoYXQgY29uc3RhbnRseSBjaGFuZ2VzIHZpc2liaWxpdHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDYzMgorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNDgwNjAyNTg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWF0dCBCYWtlciBhbmQg RGV2aW4gUm91c3NvLgorCisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01B Z2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmls aXR5Q2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxk T2JqZWN0Rm9yQWNjZXNzaWJpbGl0eVByb3BlcnRpZXMpOgorICAgICAgICBEb24ndCB1c2UgcnZh bHVlLXJlZmVyZW5jZXMgYXMgdGhhdCB3YXMgdGFraW5nIG93bmVyc2hpcCBhbmQgZGVsZXRpbmcK KyAgICAgICAgdGhlIG9iamVjdCB3ZSB3YW50IHRvIGtlZXAgYXJvdW5kLiBJbnN0ZWFkIHNpbXBs aWZ5IHRoaXMgdG8ganVzdCB1c2UKKyAgICAgICAgcmVmZXJlbmNlcyBzbyBubyByZWYgY291bnRp bmcgY2hhbmdlcyBoYXBwZW4uCisKIDIwMTktMDItMTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBCZXR0ZXIgY2F0ZWdvcml6 ZSBDUFUgdXNhZ2UgcGVyLXRocmVhZCAvIHdvcmtlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAzNTM2ZDc4ZWMw Zi4uNmRiODYxYTUwYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2Vu dHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9h Z2VudHMvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xNzQyLDIxICsxNzQyLDE4IEBAIFJlZjxJ bnNwZWN0b3I6OlByb3RvY29sOjpET006OkV2ZW50TGlzdGVuZXI+IEluc3BlY3RvckRPTUFnZW50 OjpidWlsZE9iamVjdEZvckV2CiAgICAgICAgIHZhbHVlLT5zZXRIYXNCcmVha3BvaW50KGhhc0Jy ZWFrcG9pbnQpOwogICAgIHJldHVybiB2YWx1ZTsKIH0KLSAgICAKLXZvaWQgSW5zcGVjdG9yRE9N QWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVmUHRyPEFjY2Vzc2liaWxpdHlP YmplY3Q+JiYgYXhPYmplY3QsIFJlZlB0cjxKU09OOjpBcnJheU9mPGludD4+JiYgY2hpbGROb2Rl SWRzKQorCit2b2lkIEluc3BlY3RvckRPTUFnZW50Ojpwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxk cmVuKEFjY2Vzc2liaWxpdHlPYmplY3QmIGF4T2JqZWN0LCBKU09OOjpBcnJheU9mPGludD4mIGNo aWxkTm9kZUlkcykKIHsKLSAgICBjb25zdCBhdXRvJiBjaGlsZHJlbiA9IGF4T2JqZWN0LT5jaGls ZHJlbigpOworICAgIGNvbnN0IGF1dG8mIGNoaWxkcmVuID0gYXhPYmplY3QuY2hpbGRyZW4oKTsK ICAgICBpZiAoIWNoaWxkcmVuLnNpemUoKSkKICAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGlm ICghY2hpbGROb2RlSWRzKQotICAgICAgICBjaGlsZE5vZGVJZHMgPSBKU09OOjpBcnJheU9mPGlu dD46OmNyZWF0ZSgpOwotICAgIAorCiAgICAgZm9yIChjb25zdCBhdXRvJiBjaGlsZE9iamVjdCA6 IGNoaWxkcmVuKSB7CiAgICAgICAgIGlmIChOb2RlKiBjaGlsZE5vZGUgPSBjaGlsZE9iamVjdC0+ bm9kZSgpKQotICAgICAgICAgICAgY2hpbGROb2RlSWRzLT5hZGRJdGVtKHB1c2hOb2RlUGF0aFRv RnJvbnRlbmQoY2hpbGROb2RlKSk7CisgICAgICAgICAgICBjaGlsZE5vZGVJZHMuYWRkSXRlbShw dXNoTm9kZVBhdGhUb0Zyb250ZW5kKGNoaWxkTm9kZSkpOwogICAgICAgICBlbHNlCi0gICAgICAg ICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGNoaWxkT2JqZWN0LmNvcHlSZWYoKSwg Y2hpbGROb2RlSWRzLmNvcHlSZWYoKSk7CisgICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0 eUNoaWxkcmVuKCpjaGlsZE9iamVjdCwgY2hpbGROb2RlSWRzKTsKICAgICB9CiB9CiAgICAgCkBA IC0xODMyLDcgKzE4MjksMTAgQEAgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6QWNj ZXNzaWJpbGl0eVByb3BlcnRpZXM+IEluc3BlY3RvckRPTUFnZW50OjpidWkKICAgICAgICAgICAg ICAgICAgICAgY2hlY2tlZCA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6QWNjZXNzaWJpbGl0 eVByb3BlcnRpZXM6OkNoZWNrZWQ6OlRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAK LSAgICAgICAgICAgIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oYXhPYmplY3QsIFdURk1v dmUoY2hpbGROb2RlSWRzKSk7CisgICAgICAgICAgICBpZiAoIWF4T2JqZWN0LT5jaGlsZHJlbigp LmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgIGNoaWxkTm9kZUlkcyA9IEpTT046OkFycmF5 T2Y8aW50Pjo6Y3JlYXRlKCk7CisgICAgICAgICAgICAgICAgcHJvY2Vzc0FjY2Vzc2liaWxpdHlD aGlsZHJlbigqYXhPYmplY3QsICpjaGlsZE5vZGVJZHMpOworICAgICAgICAgICAgfQogICAgICAg ICAgICAgCiAgICAgICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGNvbnRyb2xsZWRFbGVtZW50czsK ICAgICAgICAgICAgIGF4T2JqZWN0LT5lbGVtZW50c0Zyb21BdHRyaWJ1dGUoY29udHJvbGxlZEVs ZW1lbnRzLCBhcmlhX2NvbnRyb2xzQXR0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvckRPTUFnZW50LmgKaW5kZXggMjBhYjNkNTA2YTYuLmRmMWVl ZGNhZjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3Bl Y3RvckRPTUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNw ZWN0b3JET01BZ2VudC5oCkBAIC0yNDgsNyArMjQ4LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8 SlNPTjo6QXJyYXlPZjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006Ok5vZGU+PiBidWlsZEFycmF5 Rm9yUHNldWRvRWxlbWVudHMoY29uc3QgRWxlbWVudCYsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCk7 CiAgICAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6RXZlbnRMaXN0ZW5lcj4gYnVpbGRP YmplY3RGb3JFdmVudExpc3RlbmVyKGNvbnN0IFJlZ2lzdGVyZWRFdmVudExpc3RlbmVyJiwgaW50 IGlkZW50aWZpZXIsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBOb2RlKiwgY29uc3Qg U3RyaW5nKiBvYmplY3RHcm91cElkLCBib29sIGRpc2FibGVkLCBib29sIGhhc0JyZWFrcG9pbnQp OwogICAgIFJlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpET006OkFjY2Vzc2liaWxpdHlQcm9w ZXJ0aWVzPiBidWlsZE9iamVjdEZvckFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzKE5vZGUqKTsKLSAg ICB2b2lkIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVmUHRyPEFjY2Vzc2liaWxpdHlP YmplY3Q+JiYsIFJlZlB0cjxKU09OOjpBcnJheU9mPGludD4+JiYpOworICAgIHZvaWQgcHJvY2Vz c0FjY2Vzc2liaWxpdHlDaGlsZHJlbihBY2Nlc3NpYmlsaXR5T2JqZWN0JiwgSlNPTjo6QXJyYXlP ZjxpbnQ+Jik7CiAgICAgCiAgICAgTm9kZSogbm9kZUZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRo KTsKICAgICBOb2RlKiBub2RlRm9yT2JqZWN0SWQoY29uc3QgU3RyaW5nJiBvYmplY3RJZCk7Cg==