187391 2018-07-06 09:30:48 -0700 Flaky crash under WebCore::AXObjectCache::stopCachingComputedObjectAttributes() 2019-04-24 17:49:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 realdawei webkit-unassigned aboxhall andresg_22 apinheiro ap cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs lforschler n_wang ryanhaddad samuel_white sroberts tsavell webkit-bug-importer oldest_to_newest 1439793 0 realdawei 2018-07-06 09:30:48 -0700 accessibility/Mac/attachment-element-replacement-character.html is a flaky crash on High Sierra Debug WK2 (Tests) probable cause: unknown..the crash log itself does blame a different but related test (accessibility/Mac/async-increment-decrement-action.html). Investigating. Sample Crash log https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r233577%20(3998)/accessibility/mac/attachment-element-replacement-character-crash-log.txt Process: com.apple.WebKit.WebContent.Development [53843] Path: /Volumes/VOLUME/*/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.xpc/Contents/MacOS/com.apple.WebKit.WebContent.Development Identifier: com.apple.WebKit.WebContent Version: 606+ (606.1.24+) Code Type: X86-64 (Native) Parent Process: ??? [1] User ID: 501 Date/Time: 2018-07-06 05:38:45.888 -0700 OS Version: Mac OS X 10.13.4 (17E199) Report Version: 12 Anonymous UUID: A96E1A44-9057-EED1-633D-EE144C76419C Time Awake Since Boot: 7900000 seconds System Integrity Protection: enabled Crashed Thread: 0 Dispatch queue: com.apple.main-thread Exception Type: EXC_BAD_ACCESS (SIGSEGV) Exception Codes: KERN_INVALID_ADDRESS at 0x00000000000000e0 Exception Note: EXC_CORPSE_NOTIFY Termination Signal: Segmentation fault: 11 Termination Reason: Namespace SIGNAL, Code 0xb Terminating Process: exc handler [0] VM Regions Near 0xe0: --> __TEXT 00000001017d3000-00000001017d5000 [ 8K] r-x/rwx SM=COW /Volumes/VOLUME/*/WebKit.framework/Versions/A/XPCServices/com.apple.WebKit.WebContent.xpc/Contents/MacOS/com.apple.WebKit.WebContent.Development Application Specific Information: CRASHING TEST: accessibility/mac/async-increment-decrement-action.html Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebCore 0x00000001c97c08ba WebCore::AXObjectCache::stopCachingComputedObjectAttributes() + 74 (AXObjectCache.cpp:1575) 1 com.apple.WebCore 0x00000001c97c09db WebCore::AXObjectCache::postNotification(WebCore::Node*, WebCore::AXObjectCache::AXNotification, WebCore::PostTarget, WebCore::PostType) + 59 (AXObjectCache.cpp:971) 2 com.apple.WebCore 0x00000001c980e1f0 WebCore::AccessibilityNodeObject::changeValueByStep(bool) + 272 (AccessibilityNodeObject.cpp:1099) 3 com.apple.WebCore 0x00000001c980e09a WebCore::AccessibilityNodeObject::alterSliderValue(bool) + 122 (AccessibilityNodeObject.cpp:1068) 4 com.apple.WebCore 0x00000001c980e288 WebCore::AccessibilityNodeObject::increment() + 136 (AccessibilityNodeObject.cpp:1078) 5 com.apple.WebCore 0x00000001cb5d6732 -[WebAccessibilityObjectWrapper _accessibilityPerformIncrementAction] + 178 (WebAccessibilityObjectWrapperMac.mm:3518) 6 com.apple.WebCore 0x00000001cb5d6616 __68-[WebAccessibilityObjectWrapper accessibilityPerformIncrementAction]_block_invoke + 38 (WebAccessibilityObjectWrapperMac.mm:3506) 7 libdispatch.dylib 0x00007fff6cb5a64a _dispatch_call_block_and_release + 12 8 libdispatch.dylib 0x00007fff6cb52e08 _dispatch_client_callout + 8 9 libdispatch.dylib 0x00007fff6cb5e3e5 _dispatch_main_queue_callback_4CF + 1148 10 com.apple.CoreFoundation 0x00007fff44825ea9 __CFRUNLOOP_IS_SERVICING_THE_MAIN_DISPATCH_QUEUE__ + 9 11 com.apple.CoreFoundation 0x00007fff447e86ba __CFRunLoopRun + 2586 12 com.apple.CoreFoundation 0x00007fff447e7a07 CFRunLoopRunSpecific + 487 13 com.apple.HIToolbox 0x00007fff43ac5d96 RunCurrentEventLoopInMode + 286 14 com.apple.HIToolbox 0x00007fff43ac5b06 ReceiveNextEventCommon + 613 15 com.apple.HIToolbox 0x00007fff43ac5884 _BlockUntilNextEventMatchingListInModeWithFilter + 64 16 com.apple.AppKit 0x00007fff41d78a73 _DPSNextEvent + 2085 17 com.apple.AppKit 0x00007fff4250ee34 -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 3044 18 com.apple.AppKit 0x00007fff41d6d885 -[NSApplication run] + 764 19 com.apple.AppKit 0x00007fff41d3ca72 NSApplicationMain + 804 20 libxpc.dylib 0x00007fff6cee6f57 _xpc_objc_main + 580 21 libxpc.dylib 0x00007fff6cee5baa xpc_main + 417 22 com.apple.WebKit.WebContent 0x00000001017d40ab main + 1195 23 libdyld.dylib 0x00007fff6cb8c015 start + 1 1439798 1 ryanhaddad 2018-07-06 09:43:20 -0700 <rdar://problem/40681396> 1523044 2 sroberts 2019-04-01 13:44:39 -0700 Test recently started showing up on bots as a crash in Mac Release as well. Probable cause: Local testing found that running accessibility/mac/attachment-element-replacement-character.html by itself produces no failures. However, testing accessibility/Mac/async-increment-decrement-action.html by itself will cause a crash roughly 5 times out of 500 iterations. Also when I run accessibility/Mac/async-increment-decrement-action.html followed by accessibility/mac/attachment-element-replacement-character.html , the async-increment test will crash, and blame the attach-element test. Local crashes match crash logs seen here, as well as on the bots. I tested with newest revisions, it also crashes with https://trac.webkit.org/changeset/230782/webkit when the accessibility/Mac/async-increment-decrement-action.html test was created Also crashes with https://trac.webkit.org/changeset/230855/webkit when the test was modified. Reproduced with : run-webkit-tests accessibility/Mac/async-increment-decrement-action.html accessibility/Mac/attachment-element-replacement-character.html --iterations 15 --debug - causes on average 4 in 15 crashes rwt --root t230781 accessibility/Mac/async-increment-decrement-action.html accessibility/Mac/attachment-element-replacement-character.html --iterations 5 - causes on average 2 in 5 crashes run-webkit-tests accessibility/mac/async-increment-decrement-action.html --iterations 500 -f - causes on average 7 in 500 crashes Skipping test locally will cause crashes to stop. 1523046 3 sroberts 2019-04-01 13:48:15 -0700 Skipping test in https://trac.webkit.org/changeset/243710/webkit while waiting for a fix. 1525366 4 sroberts 2019-04-08 14:30:50 -0700 Had a type in original expectation change. Redid in https://trac.webkit.org/changeset/244045/webkit 1530178 5 368181 andresg_22 2019-04-24 14:56:35 -0700 Created attachment 368181 Patch 1530180 6 368181 cfleizach 2019-04-24 14:58:41 -0700 Comment on attachment 368181 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368181&action=review > Source/WebCore/ChangeLog:7 > + CHeck for null return value of AccessibilityObject::axObjectCache. CHeck -> Check 1530190 7 368185 andresg_22 2019-04-24 15:06:58 -0700 Created attachment 368185 Patch 1530195 8 andresg_22 2019-04-24 15:11:49 -0700 (In reply to chris fleizach from comment #6) > Comment on attachment 368181 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=368181&action=review > > > Source/WebCore/ChangeLog:7 > > + CHeck for null return value of AccessibilityObject::axObjectCache. > > CHeck -> Check Fixed, and fixed grammar. 1530273 9 368185 commit-queue 2019-04-24 17:49:14 -0700 Comment on attachment 368185 Patch Clearing flags on attachment: 368185 Committed r244631: <https://trac.webkit.org/changeset/244631> 1530274 10 commit-queue 2019-04-24 17:49:16 -0700 All reviewed patches have been landed. Closing bug. 368181 2019-04-24 14:56:35 -0700 2019-04-24 15:06:54 -0700 Patch bug-187391-20190424145634.patch text/plain 9655 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZhYmQ1MzliYzFlN2Jm NzQyNDYxMDk1YjJkYjllODc4ZDRiZjBhMy4uZGEzOGE5N2ZlZDA2ZGI5MTM2NTQzOTliYzk1ZWU5 MzgwYTRiNTQwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA0LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGbGFreSBjcmFz aCB1bmRlciBXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpzdG9wQ2FjaGluZ0NvbXB1dGVkT2JqZWN0 QXR0cmlidXRlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODczOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwNjgxMzk2CisKKyAgICAgICAg Q0hlY2sgZm9yIG51bGwgcmV0dXJuIHZhbHVlIG9mIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmF4T2Jq ZWN0Q2FjaGUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmVlZCBmb3IgbmV3IHRlc3Qgc2luY2UgZXhpc3RpbmcgdGVzdHMgY2F1Z2h0IHRoaXMg cHJvYmxlbS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmZpcnN0 Q2hpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6 Omxhc3RDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6cHJldmlvdXNTaWJsaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlOb2RlT2JqZWN0OjpuZXh0U2libGluZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpB Y2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6YWRkQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmFuY2hvckVsZW1lbnQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmNoYW5nZVZhbHVlQnlTdGVwKToKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpjaGFuZ2VWYWx1ZUJ5UGVy Y2VudCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGV4dEZv ckxhYmVsRWxlbWVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9k ZU9iamVjdDo6dGl0bGVFbGVtZW50VGV4dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5Tm9kZU9iamVjdDo6YWx0ZXJuYXRpdmVUZXh0IGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjphcmlhTGFiZWxlZEJ5VGV4dCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6aGVscFRleHQgY29u c3QpOgorCiAyMDE5LTA0LTI0ICBjaHJpcyBmbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CiAKICAgICAgICAgQVg6IFJlbW92ZSBkZXByZWNhdGVkIEFjY2Vzc2liaWxpdHkgT2JqZWN0IE1v ZGVsIGV2ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcAppbmRleCA5OTBjZjBjZDJmOGZmMGYwODQwZDI5MjY0 NGYyNTY5YmU0YWNlZGNjLi4xZjJlMTQ2ZTUzZGYzM2VlZjUxODdkYWZkNjQxMWE2MGQ5NzgwNmNi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlO b2RlT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlOb2RlT2JqZWN0LmNwcApAQCAtMTc3LDggKzE3Nyw5IEBAIEFjY2Vzc2liaWxpdHlPYmpl Y3QqIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpmaXJzdENoaWxkKCkgY29uc3QKIAogICAgIGlm ICghZmlyc3RDaGlsZCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgCi0gICAgcmV0dXJu IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZmlyc3RDaGlsZCk7CisKKyAgICBhdXRvIG9i amVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIHJldHVybiBvYmplY3RDYWNoZSA/IG9i amVjdENhY2hlLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKSA6IG51bGxwdHI7CiB9CiAKIEFjY2Vz c2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpsYXN0Q2hpbGQoKSBjb25z dApAQCAtMTg5LDggKzE5MCw5IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlO b2RlT2JqZWN0OjpsYXN0Q2hpbGQoKSBjb25zdAogICAgIE5vZGUqIGxhc3RDaGlsZCA9IG5vZGUo KS0+bGFzdENoaWxkKCk7CiAgICAgaWYgKCFsYXN0Q2hpbGQpCiAgICAgICAgIHJldHVybiBudWxs cHRyOwotICAgIAotICAgIHJldHVybiBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKGxhc3RD aGlsZCk7CisKKyAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIHJl dHVybiBvYmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShsYXN0Q2hpbGQpIDog bnVsbHB0cjsKIH0KIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OnByZXZpb3VzU2libGluZygpIGNvbnN0CkBAIC0yMDIsNyArMjA0LDggQEAgQWNjZXNzaWJp bGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OnByZXZpb3VzU2libGluZygpIGNv bnN0CiAgICAgaWYgKCFwcmV2aW91c1NpYmxpbmcpCiAgICAgICAgIHJldHVybiBudWxscHRyOwog Ci0gICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocHJldmlvdXNTaWJsaW5n KTsKKyAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIHJldHVybiBv YmplY3RDYWNoZSA/IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShwcmV2aW91c1NpYmxpbmcpIDog bnVsbHB0cjsKIH0KIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6Om5leHRTaWJsaW5nKCkgY29uc3QKQEAgLTIxNCw3ICsyMTcsOCBAQCBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6bmV4dFNpYmxpbmcoKSBjb25zdAogICAg IGlmICghbmV4dFNpYmxpbmcpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgcmV0dXJu IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobmV4dFNpYmxpbmcpOworICAgIGF1dG8gb2Jq ZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgcmV0dXJuIG9iamVjdENhY2hlID8gb2Jq ZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKG5leHRTaWJsaW5nKSA6IG51bGxwdHI7CiB9CiAgICAgCiBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6cGFyZW50T2JqZWN0 SWZFeGlzdHMoKSBjb25zdApAQCAtMzQ0LDkgKzM0OCwxMyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlO b2RlT2JqZWN0OjphZGRDaGlsZHJlbigpCiAgICAgLy8gVGhlIG9ubHkgdGltZSB3ZSBhZGQgY2hp bGRyZW4gZnJvbSB0aGUgRE9NIHRyZWUgdG8gYSBub2RlIHdpdGggYSByZW5kZXJlciBpcyB3aGVu IGl0J3MgYSBjYW52YXMuCiAgICAgaWYgKHJlbmRlcmVyKCkgJiYgIW1fbm9kZS0+aGFzVGFnTmFt ZShjYW52YXNUYWcpKQogICAgICAgICByZXR1cm47Ci0gICAgCisKKyAgICBhdXRvIG9iamVjdENh Y2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIGlmICghb2JqZWN0Q2FjaGUpCisgICAgICAgIHJl dHVybjsKKwogICAgIGZvciAoTm9kZSogY2hpbGQgPSBtX25vZGUtPmZpcnN0Q2hpbGQoKTsgY2hp bGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCi0gICAgICAgIGFkZENoaWxkKGF4T2Jq ZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoY2hpbGQpKTsKKyAgICAgICAgYWRkQ2hpbGQob2JqZWN0 Q2FjaGUtPmdldE9yQ3JlYXRlKGNoaWxkKSk7CiAgICAgCiAgICAgbV9zdWJ0cmVlRGlydHkgPSBm YWxzZTsKIH0KQEAgLTk0OSw2ICs5NTcsOCBAQCBFbGVtZW50KiBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6YW5jaG9yRWxlbWVudCgpIGNvbnN0CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAg ICAgQVhPYmplY3RDYWNoZSogY2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFjYWNo ZSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICAvLyBzZWFyY2ggdXAgdGhlIERPTSB0 cmVlIGZvciBhbiBhbmNob3IgZWxlbWVudAogICAgIC8vIE5PVEU6IHRoaXMgYXNzdW1lcyB0aGF0 IGFueSBub24taW1hZ2Ugd2l0aCBhbiBhbmNob3IgaXMgYW4gSFRNTEFuY2hvckVsZW1lbnQKQEAg LTEwOTYsNyArMTEwNiw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmNoYW5nZVZh bHVlQnlTdGVwKGJvb2wgaW5jcmVhc2UpCiAKICAgICBzZXRWYWx1ZShTdHJpbmc6Om51bWJlclRv U3RyaW5nRml4ZWRQcmVjaXNpb24odmFsdWUpKTsKIAotICAgIGF4T2JqZWN0Q2FjaGUoKS0+cG9z dE5vdGlmaWNhdGlvbihub2RlKCksIEFYT2JqZWN0Q2FjaGU6OkFYVmFsdWVDaGFuZ2VkKTsKKyAg ICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIGlmIChvYmplY3RDYWNo ZSkKKyAgICAgICAgb2JqZWN0Q2FjaGUtPnBvc3ROb3RpZmljYXRpb24obm9kZSgpLCBBWE9iamVj dENhY2hlOjpBWFZhbHVlQ2hhbmdlZCk7CiB9CiAKIHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3Q6OmNoYW5nZVZhbHVlQnlQZXJjZW50KGZsb2F0IHBlcmNlbnRDaGFuZ2UpCkBAIC0xMTEyLDcg KzExMjQsOSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpjaGFuZ2VWYWx1ZUJ5UGVy Y2VudChmbG9hdCBwZXJjZW50Q2hhbmdlKQogICAgIHZhbHVlICs9IHN0ZXA7CiAgICAgc2V0VmFs dWUoU3RyaW5nOjpudW1iZXJUb1N0cmluZ0ZpeGVkUHJlY2lzaW9uKHZhbHVlKSk7CiAKLSAgICBh eE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24obm9kZSgpLCBBWE9iamVjdENhY2hlOjpB WFZhbHVlQ2hhbmdlZCk7CisgICAgYXV0byBvYmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsK KyAgICBpZiAob2JqZWN0Q2FjaGUpCisgICAgICAgIG9iamVjdENhY2hlLT5wb3N0Tm90aWZpY2F0 aW9uKG5vZGUoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5nZWQpOwogfQogCiBib29sIEFj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojppc0dlbmVyaWNGb2N1c2FibGVFbGVtZW50KCkgY29uc3QK QEAgLTEyNzMsMTAgKzEyODcsMTQgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0 ZXh0Rm9yTGFiZWxFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CiAgICAgU3RyaW5nIHJl c3VsdCA9IFN0cmluZygpOwogICAgIGlmICghaXM8SFRNTExhYmVsRWxlbWVudD4oKmVsZW1lbnQp KQogICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIAorCisgICAgYXV0byBvYmplY3RDYWNoZSA9 IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICBpZiAoIW9iamVjdENhY2hlKQorICAgICAgICByZXR1cm4g cmVzdWx0OworCiAgICAgSFRNTExhYmVsRWxlbWVudCogbGFiZWwgPSBkb3duY2FzdDxIVE1MTGFi ZWxFbGVtZW50PihlbGVtZW50KTsKICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhlcmUncyBhcmlh LWxhYmVsbGVkYnkgYXR0cmlidXRlIG9uIHRoZSBsYWJlbCBlbGVtZW50LgotICAgIGlmIChBY2Nl c3NpYmlsaXR5T2JqZWN0KiBsYWJlbE9iamVjdCA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVh dGUobGFiZWwpKQorICAgIGlmIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBsYWJlbE9iamVjdCA9IG9i amVjdENhY2hlLT5nZXRPckNyZWF0ZShsYWJlbCkpCiAgICAgICAgIHJlc3VsdCA9IGxhYmVsT2Jq ZWN0LT5hcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCk7CiAgICAgCiAgICAgcmV0dXJuICFyZXN1bHQu aXNFbXB0eSgpID8gcmVzdWx0IDogYWNjZXNzaWJsZU5hbWVGb3JOb2RlKGxhYmVsKTsKQEAgLTEy OTEsMTAgKzEzMDksMTEgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dGl0bGVFbGVt ZW50VGV4dChWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+JiB0ZXh0T3IKICAgICBpZiAoaXNMYWJl bGFibGUoKSkgewogICAgICAgICBpZiAoSFRNTExhYmVsRWxlbWVudCogbGFiZWwgPSBsYWJlbEZv ckVsZW1lbnQoZG93bmNhc3Q8RWxlbWVudD4obm9kZSkpKSB7CiAgICAgICAgICAgICBTdHJpbmcg aW5uZXJUZXh0ID0gdGV4dEZvckxhYmVsRWxlbWVudChsYWJlbCk7Ci0gICAgICAgICAgICAKKwor ICAgICAgICAgICAgYXV0byBvYmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKICAgICAgICAg ICAgIC8vIE9ubHkgdXNlIHRoZSA8bGFiZWw+IHRleHQgaWYgdGhlcmUncyBubyBBUklBIG92ZXJy aWRlLgotICAgICAgICAgICAgaWYgKCFpbm5lclRleHQuaXNFbXB0eSgpICYmICFhcmlhQWNjZXNz aWJpbGl0eURlc2NyaXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgdGV4dE9yZGVyLmFwcGVuZChB Y2Nlc3NpYmlsaXR5VGV4dChpbm5lclRleHQsIGlzTWV0ZXIoKSA/IEFjY2Vzc2liaWxpdHlUZXh0 U291cmNlOjpBbHRlcm5hdGl2ZSA6IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpMYWJlbEJ5RWxl bWVudCwgYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShsYWJlbCkpKTsKKyAgICAgICAgICAg IGlmIChvYmplY3RDYWNoZSAmJiAhaW5uZXJUZXh0LmlzRW1wdHkoKSAmJiAhYXJpYUFjY2Vzc2li aWxpdHlEZXNjcmlwdGlvbigpKQorICAgICAgICAgICAgICAgIHRleHRPcmRlci5hcHBlbmQoQWNj ZXNzaWJpbGl0eVRleHQoaW5uZXJUZXh0LCBpc01ldGVyKCkgPyBBY2Nlc3NpYmlsaXR5VGV4dFNv dXJjZTo6QWx0ZXJuYXRpdmUgOiBBY2Nlc3NpYmlsaXR5VGV4dFNvdXJjZTo6TGFiZWxCeUVsZW1l bnQsIG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShsYWJlbCkpKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogICAgIH0KQEAgLTEzNDAsOSArMTM1OSwxMCBAQCB2b2lkIEFjY2Vzc2li aWxpdHlOb2RlT2JqZWN0OjphbHRlcm5hdGl2ZVRleHQoVmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0 PiYgdGV4dE9yZAogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuOwogICAgIAorICAgIGF1 dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CiAgICAgLy8gVGhlIGZpZWxkc2V0IGVs ZW1lbnQgZGVyaXZlcyBpdHMgYWx0ZXJuYXRpdmUgdGV4dCBmcm9tIHRoZSBmaXJzdCBhc3NvY2lh dGVkIGxlZ2VuZCBlbGVtZW50IGlmIG9uZSBpcyBhdmFpbGFibGUuCi0gICAgaWYgKGlzPEhUTUxG aWVsZFNldEVsZW1lbnQ+KCpub2RlKSkgewotICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBv YmplY3QgPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKGRvd25jYXN0PEhUTUxGaWVsZFNl dEVsZW1lbnQ+KCpub2RlKS5sZWdlbmQoKSk7CisgICAgaWYgKG9iamVjdENhY2hlICYmIGlzPEhU TUxGaWVsZFNldEVsZW1lbnQ+KCpub2RlKSkgeworICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0 KiBvYmplY3QgPSBvYmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUoZG93bmNhc3Q8SFRNTEZpZWxkU2V0 RWxlbWVudD4oKm5vZGUpLmxlZ2VuZCgpKTsKICAgICAgICAgaWYgKG9iamVjdCAmJiAhb2JqZWN0 LT5pc0hpZGRlbigpKQogICAgICAgICAgICAgdGV4dE9yZGVyLmFwcGVuZChBY2Nlc3NpYmlsaXR5 VGV4dChhY2Nlc3NpYmxlTmFtZUZvck5vZGUob2JqZWN0LT5ub2RlKCkpLCBBY2Nlc3NpYmlsaXR5 VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmUpKTsKICAgICB9CkBAIC0xNDg2LDEyICsxNTA2LDE2IEBA IHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmFyaWFMYWJlbGVkQnlUZXh0KFZlY3RvcjxB Y2Nlc3NpYmlsaXR5VGV4dD4mIHRleHRPCiB7CiAgICAgU3RyaW5nIGFyaWFMYWJlbGVkQnkgPSBh cmlhTGFiZWxlZEJ5QXR0cmlidXRlKCk7CiAgICAgaWYgKCFhcmlhTGFiZWxlZEJ5LmlzRW1wdHko KSkgeworICAgICAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgICAg ICBpZiAoIW9iamVjdENhY2hlKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIFZlY3Rv cjxFbGVtZW50Kj4gZWxlbWVudHM7CiAgICAgICAgIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhlbGVt ZW50cyk7Ci0gICAgICAgIAorCiAgICAgICAgIFZlY3RvcjxSZWZQdHI8QWNjZXNzaWJpbGl0eU9i amVjdD4+IGF4RWxlbWVudHM7CiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgZWxlbWVudCA6IGVs ZW1lbnRzKQotICAgICAgICAgICAgYXhFbGVtZW50cy5hcHBlbmQoYXhPYmplY3RDYWNoZSgpLT5n ZXRPckNyZWF0ZShlbGVtZW50KSk7CisgICAgICAgICAgICBheEVsZW1lbnRzLmFwcGVuZChvYmpl Y3RDYWNoZS0+Z2V0T3JDcmVhdGUoZWxlbWVudCkpOwogICAgICAgICAKICAgICAgICAgdGV4dE9y ZGVyLmFwcGVuZChBY2Nlc3NpYmlsaXR5VGV4dChhcmlhTGFiZWxlZEJ5LCBBY2Nlc3NpYmlsaXR5 VGV4dFNvdXJjZTo6QWx0ZXJuYXRpdmUsIFdURk1vdmUoYXhFbGVtZW50cykpKTsKICAgICB9CkBA IC0xNjE2LDEwICsxNjQwLDE0IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6aGVs cFRleHQoKSBjb25zdAogICAgICAgICAgICAgaWYgKCF0aXRsZS5pc0VtcHR5KCkgJiYgZGVzY3Jp cHRpb24gIT0gdGl0bGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRpdGxlOwogICAgICAgICB9 Ci0gICAgICAgIAotICAgICAgICAvLyBPbmx5IHRha2UgaGVscCB0ZXh0IGZyb20gYW4gYW5jZXN0 b3IgZWxlbWVudCBpZiBpdHMgYSBncm91cCBvciBhbiB1bmtub3duIHJvbGUuIElmIGhlbHAgd2Fz IAorCisgICAgICAgIGF1dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgICAg IGlmICghb2JqZWN0Q2FjaGUpCisgICAgICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICAg ICAgLy8gT25seSB0YWtlIGhlbHAgdGV4dCBmcm9tIGFuIGFuY2VzdG9yIGVsZW1lbnQgaWYgaXRz IGEgZ3JvdXAgb3IgYW4gdW5rbm93biByb2xlLiBJZiBoZWxwIHdhcwogICAgICAgICAvLyBhZGRl ZCB0byB0aG9zZSBraW5kcyBvZiBlbGVtZW50cywgaXQgaXMgbGlrZWx5IGl0IHdhcyBtZWFudCBm b3IgYSBjaGlsZCBlbGVtZW50LgotICAgICAgICBpZiAoQWNjZXNzaWJpbGl0eU9iamVjdCogYXhP YmogPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKGFuY2VzdG9yKSkgeworICAgICAgICBp ZiAoQWNjZXNzaWJpbGl0eU9iamVjdCogYXhPYmogPSBvYmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUo YW5jZXN0b3IpKSB7CiAgICAgICAgICAgICBpZiAoIWF4T2JqLT5pc0dyb3VwKCkgJiYgYXhPYmot PnJvbGVWYWx1ZSgpICE9IEFjY2Vzc2liaWxpdHlSb2xlOjpVbmtub3duKQogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9Cg== 368185 2019-04-24 15:06:58 -0700 2019-04-24 17:49:14 -0700 Patch bug-187391-20190424150657.patch text/plain 9657 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZhYmQ1MzliYzFlN2Jm NzQyNDYxMDk1YjJkYjllODc4ZDRiZjBhMy4uNGE3NzMxNzFjNmYyNmZjODQ5ZGYzNGU5NTFhMmFi OThiNzBmOThhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA0LTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGbGFreSBjcmFz aCB1bmRlciBXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpzdG9wQ2FjaGluZ0NvbXB1dGVkT2JqZWN0 QXR0cmlidXRlcygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODczOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQwNjgxMzk2CisKKyAgICAgICAg Q2hlY2sgZm9yIG51bGwgdmFsdWUgcmV0dXJuZWQgYnkgQWNjZXNzaWJpbGl0eU9iamVjdDo6YXhP YmplY3RDYWNoZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZWVkIGZvciBuZXcgdGVzdCBzaW5jZSBleGlzdGluZyB0ZXN0cyBjYXVnaHQgdGhp cyBwcm9ibGVtLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Zmly c3RDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVj dDo6bGFzdENoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2Rl T2JqZWN0OjpwcmV2aW91c1NpYmxpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eU5vZGVPYmplY3Q6Om5leHRTaWJsaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjphZGRDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6YW5jaG9yRWxlbWVudCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Y2hhbmdlVmFsdWVCeVN0ZXApOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmNoYW5nZVZhbHVlQnlQ ZXJjZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0ZXh0 Rm9yTGFiZWxFbGVtZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlO b2RlT2JqZWN0Ojp0aXRsZUVsZW1lbnRUZXh0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0OjphbHRlcm5hdGl2ZVRleHQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmFyaWFMYWJlbGVkQnlUZXh0IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpoZWxwVGV4dCBj b25zdCk6CisKIDIwMTktMDQtMjQgIGNocmlzIGZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNv bT4KIAogICAgICAgICBBWDogUmVtb3ZlIGRlcHJlY2F0ZWQgQWNjZXNzaWJpbGl0eSBPYmplY3Qg TW9kZWwgZXZlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCmluZGV4IDk5MGNmMGNkMmY4ZmYwZjA4NDBkMjky NjQ0ZjI1NjliZTRhY2VkY2MuLjFmMmUxNDZlNTNkZjMzZWVmNTE4N2RhZmQ2NDExYTYwZDk3ODA2 Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eU5vZGVPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU5vZGVPYmplY3QuY3BwCkBAIC0xNzcsOCArMTc3LDkgQEAgQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmZpcnN0Q2hpbGQoKSBjb25zdAogCiAgICAg aWYgKCFmaXJzdENoaWxkKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAKLSAgICByZXR1 cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShmaXJzdENoaWxkKTsKKworICAgIGF1dG8g b2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgcmV0dXJuIG9iamVjdENhY2hlID8g b2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKGZpcnN0Q2hpbGQpIDogbnVsbHB0cjsKIH0KIAogQWNj ZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNv bnN0CkBAIC0xODksOCArMTkwLDkgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0 eU5vZGVPYmplY3Q6Omxhc3RDaGlsZCgpIGNvbnN0CiAgICAgTm9kZSogbGFzdENoaWxkID0gbm9k ZSgpLT5sYXN0Q2hpbGQoKTsKICAgICBpZiAoIWxhc3RDaGlsZCkKICAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0gICAgCi0gICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobGFz dENoaWxkKTsKKworICAgIGF1dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAg cmV0dXJuIG9iamVjdENhY2hlID8gb2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKGxhc3RDaGlsZCkg OiBudWxscHRyOwogfQogCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6cHJldmlvdXNTaWJsaW5nKCkgY29uc3QKQEAgLTIwMiw3ICsyMDQsOCBAQCBBY2Nlc3Np YmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6cHJldmlvdXNTaWJsaW5nKCkg Y29uc3QKICAgICBpZiAoIXByZXZpb3VzU2libGluZykKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKLSAgICByZXR1cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShwcmV2aW91c1NpYmxp bmcpOworICAgIGF1dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgcmV0dXJu IG9iamVjdENhY2hlID8gb2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKHByZXZpb3VzU2libGluZykg OiBudWxscHRyOwogfQogCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6bmV4dFNpYmxpbmcoKSBjb25zdApAQCAtMjE0LDcgKzIxNyw4IEBAIEFjY2Vzc2liaWxp dHlPYmplY3QqIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpuZXh0U2libGluZygpIGNvbnN0CiAg ICAgaWYgKCFuZXh0U2libGluZykKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICByZXR1 cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShuZXh0U2libGluZyk7CisgICAgYXV0byBv YmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICByZXR1cm4gb2JqZWN0Q2FjaGUgPyBv YmplY3RDYWNoZS0+Z2V0T3JDcmVhdGUobmV4dFNpYmxpbmcpIDogbnVsbHB0cjsKIH0KICAgICAK IEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpwYXJlbnRPYmpl Y3RJZkV4aXN0cygpIGNvbnN0CkBAIC0zNDQsOSArMzQ4LDEzIEBAIHZvaWQgQWNjZXNzaWJpbGl0 eU5vZGVPYmplY3Q6OmFkZENoaWxkcmVuKCkKICAgICAvLyBUaGUgb25seSB0aW1lIHdlIGFkZCBj aGlsZHJlbiBmcm9tIHRoZSBET00gdHJlZSB0byBhIG5vZGUgd2l0aCBhIHJlbmRlcmVyIGlzIHdo ZW4gaXQncyBhIGNhbnZhcy4KICAgICBpZiAocmVuZGVyZXIoKSAmJiAhbV9ub2RlLT5oYXNUYWdO YW1lKGNhbnZhc1RhZykpCiAgICAgICAgIHJldHVybjsKLSAgICAKKworICAgIGF1dG8gb2JqZWN0 Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFvYmplY3RDYWNoZSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgZm9yIChOb2RlKiBjaGlsZCA9IG1fbm9kZS0+Zmlyc3RDaGlsZCgpOyBj aGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKLSAgICAgICAgYWRkQ2hpbGQoYXhP YmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShjaGlsZCkpOworICAgICAgICBhZGRDaGlsZChvYmpl Y3RDYWNoZS0+Z2V0T3JDcmVhdGUoY2hpbGQpKTsKICAgICAKICAgICBtX3N1YnRyZWVEaXJ0eSA9 IGZhbHNlOwogfQpAQCAtOTQ5LDYgKzk1Nyw4IEBAIEVsZW1lbnQqIEFjY2Vzc2liaWxpdHlOb2Rl T2JqZWN0OjphbmNob3JFbGVtZW50KCkgY29uc3QKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAK ICAgICBBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICBpZiAoIWNh Y2hlKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIC8vIHNlYXJjaCB1cCB0aGUgRE9N IHRyZWUgZm9yIGFuIGFuY2hvciBlbGVtZW50CiAgICAgLy8gTk9URTogdGhpcyBhc3N1bWVzIHRo YXQgYW55IG5vbi1pbWFnZSB3aXRoIGFuIGFuY2hvciBpcyBhbiBIVE1MQW5jaG9yRWxlbWVudApA QCAtMTA5Niw3ICsxMTA2LDkgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6Y2hhbmdl VmFsdWVCeVN0ZXAoYm9vbCBpbmNyZWFzZSkKIAogICAgIHNldFZhbHVlKFN0cmluZzo6bnVtYmVy VG9TdHJpbmdGaXhlZFByZWNpc2lvbih2YWx1ZSkpOwogCi0gICAgYXhPYmplY3RDYWNoZSgpLT5w b3N0Tm90aWZpY2F0aW9uKG5vZGUoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5nZWQpOwor ICAgIGF1dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgaWYgKG9iamVjdENh Y2hlKQorICAgICAgICBvYmplY3RDYWNoZS0+cG9zdE5vdGlmaWNhdGlvbihub2RlKCksIEFYT2Jq ZWN0Q2FjaGU6OkFYVmFsdWVDaGFuZ2VkKTsKIH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9i amVjdDo6Y2hhbmdlVmFsdWVCeVBlcmNlbnQoZmxvYXQgcGVyY2VudENoYW5nZSkKQEAgLTExMTIs NyArMTEyNCw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmNoYW5nZVZhbHVlQnlQ ZXJjZW50KGZsb2F0IHBlcmNlbnRDaGFuZ2UpCiAgICAgdmFsdWUgKz0gc3RlcDsKICAgICBzZXRW YWx1ZShTdHJpbmc6Om51bWJlclRvU3RyaW5nRml4ZWRQcmVjaXNpb24odmFsdWUpKTsKIAotICAg IGF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNhdGlvbihub2RlKCksIEFYT2JqZWN0Q2FjaGU6 OkFYVmFsdWVDaGFuZ2VkKTsKKyAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgp OworICAgIGlmIChvYmplY3RDYWNoZSkKKyAgICAgICAgb2JqZWN0Q2FjaGUtPnBvc3ROb3RpZmlj YXRpb24obm9kZSgpLCBBWE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCk7CiB9CiAKIGJvb2wg QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmlzR2VuZXJpY0ZvY3VzYWJsZUVsZW1lbnQoKSBjb25z dApAQCAtMTI3MywxMCArMTI4NywxNCBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6 OnRleHRGb3JMYWJlbEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkgY29uc3QKICAgICBTdHJpbmcg cmVzdWx0ID0gU3RyaW5nKCk7CiAgICAgaWYgKCFpczxIVE1MTGFiZWxFbGVtZW50PigqZWxlbWVu dCkpCiAgICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgCisKKyAgICBhdXRvIG9iamVjdENhY2hl ID0gYXhPYmplY3RDYWNoZSgpOworICAgIGlmICghb2JqZWN0Q2FjaGUpCisgICAgICAgIHJldHVy biByZXN1bHQ7CisKICAgICBIVE1MTGFiZWxFbGVtZW50KiBsYWJlbCA9IGRvd25jYXN0PEhUTUxM YWJlbEVsZW1lbnQ+KGVsZW1lbnQpOwogICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGVyZSdzIGFy aWEtbGFiZWxsZWRieSBhdHRyaWJ1dGUgb24gdGhlIGxhYmVsIGVsZW1lbnQuCi0gICAgaWYgKEFj Y2Vzc2liaWxpdHlPYmplY3QqIGxhYmVsT2JqZWN0ID0gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNy ZWF0ZShsYWJlbCkpCisgICAgaWYgKEFjY2Vzc2liaWxpdHlPYmplY3QqIGxhYmVsT2JqZWN0ID0g b2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKGxhYmVsKSkKICAgICAgICAgcmVzdWx0ID0gbGFiZWxP YmplY3QtPmFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKTsKICAgICAKICAgICByZXR1cm4gIXJlc3Vs dC5pc0VtcHR5KCkgPyByZXN1bHQgOiBhY2Nlc3NpYmxlTmFtZUZvck5vZGUobGFiZWwpOwpAQCAt MTI5MSwxMCArMTMwOSwxMSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp0aXRsZUVs ZW1lbnRUZXh0KFZlY3RvcjxBY2Nlc3NpYmlsaXR5VGV4dD4mIHRleHRPcgogICAgIGlmIChpc0xh YmVsYWJsZSgpKSB7CiAgICAgICAgIGlmIChIVE1MTGFiZWxFbGVtZW50KiBsYWJlbCA9IGxhYmVs Rm9yRWxlbWVudChkb3duY2FzdDxFbGVtZW50Pihub2RlKSkpIHsKICAgICAgICAgICAgIFN0cmlu ZyBpbm5lclRleHQgPSB0ZXh0Rm9yTGFiZWxFbGVtZW50KGxhYmVsKTsKLSAgICAgICAgICAgIAor CisgICAgICAgICAgICBhdXRvIG9iamVjdENhY2hlID0gYXhPYmplY3RDYWNoZSgpOwogICAgICAg ICAgICAgLy8gT25seSB1c2UgdGhlIDxsYWJlbD4gdGV4dCBpZiB0aGVyZSdzIG5vIEFSSUEgb3Zl cnJpZGUuCi0gICAgICAgICAgICBpZiAoIWlubmVyVGV4dC5pc0VtcHR5KCkgJiYgIWFyaWFBY2Nl c3NpYmlsaXR5RGVzY3JpcHRpb24oKSkKLSAgICAgICAgICAgICAgICB0ZXh0T3JkZXIuYXBwZW5k KEFjY2Vzc2liaWxpdHlUZXh0KGlubmVyVGV4dCwgaXNNZXRlcigpID8gQWNjZXNzaWJpbGl0eVRl eHRTb3VyY2U6OkFsdGVybmF0aXZlIDogQWNjZXNzaWJpbGl0eVRleHRTb3VyY2U6OkxhYmVsQnlF bGVtZW50LCBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKGxhYmVsKSkpOworICAgICAgICAg ICAgaWYgKG9iamVjdENhY2hlICYmICFpbm5lclRleHQuaXNFbXB0eSgpICYmICFhcmlhQWNjZXNz aWJpbGl0eURlc2NyaXB0aW9uKCkpCisgICAgICAgICAgICAgICAgdGV4dE9yZGVyLmFwcGVuZChB Y2Nlc3NpYmlsaXR5VGV4dChpbm5lclRleHQsIGlzTWV0ZXIoKSA/IEFjY2Vzc2liaWxpdHlUZXh0 U291cmNlOjpBbHRlcm5hdGl2ZSA6IEFjY2Vzc2liaWxpdHlUZXh0U291cmNlOjpMYWJlbEJ5RWxl bWVudCwgb2JqZWN0Q2FjaGUtPmdldE9yQ3JlYXRlKGxhYmVsKSkpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMTM0MCw5ICsxMzU5LDEwIEBAIHZvaWQgQWNjZXNz aWJpbGl0eU5vZGVPYmplY3Q6OmFsdGVybmF0aXZlVGV4dChWZWN0b3I8QWNjZXNzaWJpbGl0eVRl eHQ+JiB0ZXh0T3JkCiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm47CiAgICAgCisgICAg YXV0byBvYmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKICAgICAvLyBUaGUgZmllbGRzZXQg ZWxlbWVudCBkZXJpdmVzIGl0cyBhbHRlcm5hdGl2ZSB0ZXh0IGZyb20gdGhlIGZpcnN0IGFzc29j aWF0ZWQgbGVnZW5kIGVsZW1lbnQgaWYgb25lIGlzIGF2YWlsYWJsZS4KLSAgICBpZiAoaXM8SFRN TEZpZWxkU2V0RWxlbWVudD4oKm5vZGUpKSB7Ci0gICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IG9iamVjdCA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZG93bmNhc3Q8SFRNTEZpZWxk U2V0RWxlbWVudD4oKm5vZGUpLmxlZ2VuZCgpKTsKKyAgICBpZiAob2JqZWN0Q2FjaGUgJiYgaXM8 SFRNTEZpZWxkU2V0RWxlbWVudD4oKm5vZGUpKSB7CisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmpl Y3QqIG9iamVjdCA9IG9iamVjdENhY2hlLT5nZXRPckNyZWF0ZShkb3duY2FzdDxIVE1MRmllbGRT ZXRFbGVtZW50Pigqbm9kZSkubGVnZW5kKCkpOwogICAgICAgICBpZiAob2JqZWN0ICYmICFvYmpl Y3QtPmlzSGlkZGVuKCkpCiAgICAgICAgICAgICB0ZXh0T3JkZXIuYXBwZW5kKEFjY2Vzc2liaWxp dHlUZXh0KGFjY2Vzc2libGVOYW1lRm9yTm9kZShvYmplY3QtPm5vZGUoKSksIEFjY2Vzc2liaWxp dHlUZXh0U291cmNlOjpBbHRlcm5hdGl2ZSkpOwogICAgIH0KQEAgLTE0ODYsMTIgKzE1MDYsMTYg QEAgdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6YXJpYUxhYmVsZWRCeVRleHQoVmVjdG9y PEFjY2Vzc2liaWxpdHlUZXh0PiYgdGV4dE8KIHsKICAgICBTdHJpbmcgYXJpYUxhYmVsZWRCeSA9 IGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKTsKICAgICBpZiAoIWFyaWFMYWJlbGVkQnkuaXNFbXB0 eSgpKSB7CisgICAgICAgIGF1dG8gb2JqZWN0Q2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAg ICAgIGlmICghb2JqZWN0Q2FjaGUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgVmVj dG9yPEVsZW1lbnQqPiBlbGVtZW50czsKICAgICAgICAgYXJpYUxhYmVsZWRCeUVsZW1lbnRzKGVs ZW1lbnRzKTsKLSAgICAgICAgCisKICAgICAgICAgVmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0Pj4gYXhFbGVtZW50czsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBlbGVtZW50IDog ZWxlbWVudHMpCi0gICAgICAgICAgICBheEVsZW1lbnRzLmFwcGVuZChheE9iamVjdENhY2hlKCkt PmdldE9yQ3JlYXRlKGVsZW1lbnQpKTsKKyAgICAgICAgICAgIGF4RWxlbWVudHMuYXBwZW5kKG9i amVjdENhY2hlLT5nZXRPckNyZWF0ZShlbGVtZW50KSk7CiAgICAgICAgIAogICAgICAgICB0ZXh0 T3JkZXIuYXBwZW5kKEFjY2Vzc2liaWxpdHlUZXh0KGFyaWFMYWJlbGVkQnksIEFjY2Vzc2liaWxp dHlUZXh0U291cmNlOjpBbHRlcm5hdGl2ZSwgV1RGTW92ZShheEVsZW1lbnRzKSkpOwogICAgIH0K QEAgLTE2MTYsMTAgKzE2NDAsMTQgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojpo ZWxwVGV4dCgpIGNvbnN0CiAgICAgICAgICAgICBpZiAoIXRpdGxlLmlzRW1wdHkoKSAmJiBkZXNj cmlwdGlvbiAhPSB0aXRsZSkKICAgICAgICAgICAgICAgICByZXR1cm4gdGl0bGU7CiAgICAgICAg IH0KLSAgICAgICAgCi0gICAgICAgIC8vIE9ubHkgdGFrZSBoZWxwIHRleHQgZnJvbSBhbiBhbmNl c3RvciBlbGVtZW50IGlmIGl0cyBhIGdyb3VwIG9yIGFuIHVua25vd24gcm9sZS4gSWYgaGVscCB3 YXMgCisKKyAgICAgICAgYXV0byBvYmplY3RDYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICAg ICAgaWYgKCFvYmplY3RDYWNoZSkKKyAgICAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAg ICAgICAvLyBPbmx5IHRha2UgaGVscCB0ZXh0IGZyb20gYW4gYW5jZXN0b3IgZWxlbWVudCBpZiBp dHMgYSBncm91cCBvciBhbiB1bmtub3duIHJvbGUuIElmIGhlbHAgd2FzCiAgICAgICAgIC8vIGFk ZGVkIHRvIHRob3NlIGtpbmRzIG9mIGVsZW1lbnRzLCBpdCBpcyBsaWtlbHkgaXQgd2FzIG1lYW50 IGZvciBhIGNoaWxkIGVsZW1lbnQuCi0gICAgICAgIGlmIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBh eE9iaiA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoYW5jZXN0b3IpKSB7CisgICAgICAg IGlmIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBheE9iaiA9IG9iamVjdENhY2hlLT5nZXRPckNyZWF0 ZShhbmNlc3RvcikpIHsKICAgICAgICAgICAgIGlmICghYXhPYmotPmlzR3JvdXAoKSAmJiBheE9i ai0+cm9sZVZhbHVlKCkgIT0gQWNjZXNzaWJpbGl0eVJvbGU6OlVua25vd24pCiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0K