177071 2017-09-18 08:10:25 -0700 [WK1] Layout Test fast/events/beforeunload-dom-manipulation-crash.html is crashing. 2018-01-02 09:54:32 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=181204 InRadar P2 Normal --- 1 pvollan pvollan achristensen ararunprasad bfulgham buildbot cdumez commit-queue dbates japhet lforschler webkit-bug-importer oldest_to_newest 1349892 0 pvollan 2017-09-18 08:10:25 -0700 The following layout test is crashing on Windows: fast/events/beforeunload-dom-manipulation-crash.html 1349942 1 pvollan 2017-09-18 09:46:53 -0700 FAULTING_IP: WebKit!WebCore::HistoryController::updateForRedirectWithLockedBackForwardList+1a [c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\loader\historycontroller.cpp @ 418] 67318dda 8bb084050000 mov esi,dword ptr [eax+584h] EXCEPTION_RECORD: ffffffffffffffff -- (.exr 0xffffffffffffffff) .exr 0xffffffffffffffff ExceptionAddress: 0000000067318dda (WebKit!PAL::SessionID::isEphemeral) ExceptionCode: c0000005 (Access violation) ExceptionFlags: 00000000 NumberParameters: 2 Parameter[0]: 0000000000000000 Parameter[1]: 0000000000000584 Attempt to read from address 0000000000000584 STACK_TEXT: 0017e1fc 66f5b747 08f27f78 00000000 090128d0 WebKit!WebCore::HistoryController::updateForRedirectWithLockedBackForwardList+0x1a 0017e210 66f59a37 00000000 08f51e60 090128d0 WebKit!WebCore::FrameLoader::transitionToCommitted+0x177 0017e58c 66f4f78c 00000003 090128d0 0017e5c0 WebKit!WebCore::FrameLoader::commitProvisionalLoad+0x167 0017e59c 66f508a1 08ffeac8 00000003 00000003 WebKit!WebCore::DocumentLoader::commitLoad+0x3c 0017e5c0 66f502a1 08ffeac8 00000003 0017e60c WebKit!WebCore::DocumentLoader::dataReceived+0x91 0017e5d0 674dfc7a 058c0968 08ffeac8 00000003 WebKit!WebCore::DocumentLoader::dataReceived+0x11 0017e60c 674df6b7 08ffeac8 00000003 0017e684 WebKit!WebCore::CachedRawResource::notifyClientsDataWasReceived+0x4a 0017e640 66f67123 0900e620 08f8a0ac 08ffead8 WebKit!WebCore::CachedRawResource::addDataBuffer+0xa7 0017e658 66f66a48 00000000 00000000 00000000 WebKit!WebCore::SubresourceLoader::didReceiveDataOrBuffer+0x93 0017e67c 66f621b0 0900e620 00000003 00000000 WebKit!WebCore::SubresourceLoader::didReceiveBuffer+0x28 0017e9f8 66f623da 00328c01 0900e558 6af83044 WebKit!<lambda_1b5c0f757fd788f55dc65d669fddc406>::operator()<std::optional<WebCore::DataURLDecoder::Result> >+0x260 0017ea18 674eb879 73fae801 00000000 00000000 WebKit!WTF::Function<void __cdecl(std::optional<WebCore::DataURLDecoder::Result>)>::CallableWrapper<<lambda_1b5c0f757fd788f55dc65d669fddc406> >::call+0x5a 0017ea38 674eb796 0017ea01 00000000 00000000 WebKit!WTF::Function<void __cdecl(std::optional<WebCore::DataURLDecoder::Result>)>::operator()+0x59 0017ea54 6aef93b7 00000000 00000000 6af2a030 WebKit!<lambda_6ed09d88622e374e515957791c47d845>::operator()+0x66 0017ea84 6af2a043 0017eab8 76c462fa 991e090c WTF!WTF::dispatchFunctionsFromMainThread+0xe7 0017ea8c 76c462fa 991e090c 0000c15c 00000000 WTF!WTF::ThreadingWindowWndProc+0x13 WARNING: Stack unwind information not available. Following frames may be wrong. 0017eab8 76c46d3a 6af2a030 991e090c 0000c15c USER32!gapfnScSendMessage+0x332 0017eb30 76c477c4 00000000 6af2a030 991e090c USER32!GetThreadDesktop+0xd7 0017eb90 76c4788a 6af2a030 00000000 0017ecc8 USER32!CharPrevW+0x138 0017eba0 6b69dcee 0017ec2c 00722300 009fa990 USER32!DispatchMessageW+0xf 0017ecc8 6b69997a 0017ece0 012f6df0 00722300 DumpRenderTreeLib!runTest+0x6de 0017f540 6b699b4e 00000002 00722300 0017f818 DumpRenderTreeLib!main+0x43a 0017f550 012e16c9 00000002 00722300 012f6dec DumpRenderTreeLib!dllLauncherEntryPoint+0xe 0017f818 012e32ba 00000002 00722300 00725b10 DumpRenderTree!main+0x469 0017f864 7516336a 7efde000 0017f8b0 772e9902 DumpRenderTree!__scrt_common_main_seh+0xff 0017f870 772e9902 7efde000 532031e6 00000000 KERNEL32!BaseThreadInitThunk+0x12 0017f8b0 772e98d5 012e3337 7efde000 00000000 ntdll_772b0000!RtlInitializeExceptionChain+0x63 0017f8c8 00000000 012e3337 7efde000 00000000 ntdll_772b0000!RtlInitializeExceptionChain+0x36 1349944 2 321101 pvollan 2017-09-18 09:51:36 -0700 Created attachment 321101 Patch 1349954 3 321101 bfulgham 2017-09-18 10:01:57 -0700 Comment on attachment 321101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321101&action=review Thank you for fixing this. Please make the two adjustments I requested so we have a complete fix. > Source/WebCore/ChangeLog:9 > + accessing the page. Thank you! I have an partial patch for this that touches one or two other things. Let me annotate your patch. Can you please make the same fix in "HistoryController::updateForSameDocumentNavigation". In that method, it checks the page for "usesEphemeralSession" before it checks for a nullptr page. THEN it checks for nullptr! In the same vein, can you please move the ASSERT(m_frame.page()) in "HistoryController::replaceState" so that it is called before the dereference of page to call 'usesEphemeralSession'? 1349960 4 321103 pvollan 2017-09-18 10:12:05 -0700 Created attachment 321103 Patch 1349961 5 pvollan 2017-09-18 10:13:52 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 321101 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=321101&action=review > > Thank you for fixing this. Please make the two adjustments I requested so we > have a complete fix. > > > Source/WebCore/ChangeLog:9 > > + accessing the page. > > Thank you! I have an partial patch for this that touches one or two other > things. Let me annotate your patch. > > Can you please make the same fix in > "HistoryController::updateForSameDocumentNavigation". In that method, it > checks the page for "usesEphemeralSession" before it checks for a nullptr > page. THEN it checks for nullptr! > > In the same vein, can you please move the ASSERT(m_frame.page()) in > "HistoryController::replaceState" so that it is called before the > dereference of page to call 'usesEphemeralSession'? Thanks for reviewing! I have updated the patch. 1349972 6 321103 bfulgham 2017-09-18 10:28:06 -0700 Comment on attachment 321103 Patch Looks great! r=me. 1349974 7 bfulgham 2017-09-18 10:28:32 -0700 *** Bug 177020 has been marked as a duplicate of this bug. *** 1349988 8 321103 commit-queue 2017-09-18 11:01:51 -0700 Comment on attachment 321103 Patch Clearing flags on attachment: 321103 Committed r222163: <http://trac.webkit.org/changeset/222163> 1349989 9 commit-queue 2017-09-18 11:01:53 -0700 All reviewed patches have been landed. Closing bug. 1350003 10 bfulgham 2017-09-18 11:21:18 -0700 Note: This is also <rdar://problem/34465570>. 1353352 11 webkit-bug-importer 2017-09-27 12:24:44 -0700 <rdar://problem/34693215> 1385037 12 ararunprasad 2017-12-31 22:11:51 -0800 Still "fast/events/beforeunload-dom-manipulation-crash.html" crashes on few platforms, See AppleWin test result, https://build.webkit.org/builders/Apple%20Win%207%20Release%20%28Tests%29/builds/3613/steps/layout-test/logs/stdio 321101 2017-09-18 09:51:36 -0700 2017-09-18 10:12:03 -0700 Patch bug-177071-20170918185136.patch text/plain 2787 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjE1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA5LTE4ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV0sxXSBMYXlvdXQgVGVz dCBmYXN0L2V2ZW50cy9iZWZvcmV1bmxvYWQtZG9tLW1hbmlwdWxhdGlvbi1jcmFzaC5odG1sIGlz IGNyYXNoaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc3MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIFBhZ2UgcG9pbnRlciBpbiB0aGUgaGlzdG9yeSBjb250cm9sbGVyJ3MgZnJhbWUgaXMg bnVsbC4gQWRkIGEgbnVsbCBwb2ludGVyIGNoZWNrIGJlZm9yZQorICAgICAgICBhY2Nlc3Npbmcg dGhlIHBhZ2UuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGl0aW5nIHRl c3RzLgorCisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JTdGFuZGFyZExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclJlZGlyZWN0V2l0aExv Y2tlZEJhY2tGb3J3YXJkTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5Q29udHJvbGxl cjo6dXBkYXRlRm9yQ2xpZW50UmVkaXJlY3QpOgorCiAyMDE3LTA5LTE3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMjE5 NzQpOiBbSGFyZmJ1enpdIFRlc3QgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvaGVicmV3LXNlbGVj dGlvbi5odG1sIGlzIGZhaWxpbmcgc2luY2UgcjIyMTk3NApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyMjIxNDgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zODEsNyArMzgxLDcgQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6dXBkYXRlRm9yU3RhbmRh cgogCiAgICAgRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyID0gbV9mcmFtZS5sb2FkZXIoKTsKIAot ICAgIGJvb2wgbmVlZFByaXZhY3kgPSBtX2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKTsKKyAgICBib29sIG5lZWRQcml2YWN5ID0gbV9mcmFtZS5wYWdlKCkgPyBtX2ZyYW1lLnBh Z2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKSA6IHRydWU7CiAgICAgY29uc3QgVVJMJiBoaXN0 b3J5VVJMID0gZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpOwog CiAgICAgaWYgKCFmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0 KCkpIHsKQEAgLTQxNSw3ICs0MTUsNyBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVG b3JSZWRpcmVjCiB7CiAgICAgTE9HKEhpc3RvcnksICJIaXN0b3J5Q29udHJvbGxlciAlcCB1cGRh dGVGb3JSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q6IFVwZGF0aW5nIEhpc3Rvcnkg Zm9yIHJlZGlyZWN0IGxvYWQgaW4gZnJhbWUgJXAgKG1haW4gZnJhbWUgJWQpICVzIiwgdGhpcywg Jm1fZnJhbWUsIG1fZnJhbWUuaXNNYWluRnJhbWUoKSwgbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVu dExvYWRlcigpID8gbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT51cmwoKS5zdHJp bmcoKS51dGY4KCkuZGF0YSgpIDogIiIpOwogICAgIAotICAgIGJvb2wgbmVlZFByaXZhY3kgPSBt X2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKTsKKyAgICBib29sIG5lZWRQcml2 YWN5ID0gbV9mcmFtZS5wYWdlKCkgPyBtX2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKSA6IHRydWU7CiAgICAgY29uc3QgVVJMJiBoaXN0b3J5VVJMID0gbV9mcmFtZS5sb2FkZXIo KS5kb2N1bWVudExvYWRlcigpLT51cmxGb3JIaXN0b3J5KCk7CiAKICAgICBpZiAobV9mcmFtZS5s b2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0KCkpIHsKQEAgLTQ2MCw3 ICs0NjAsNyBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JDbGllbnRSCiAgICAg ICAgIG1fY3VycmVudEl0ZW0tPmNsZWFyU2Nyb2xsUG9zaXRpb24oKTsKICAgICB9CiAKLSAgICBi b29sIG5lZWRQcml2YWN5ID0gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7 CisgICAgYm9vbCBuZWVkUHJpdmFjeSA9IG1fZnJhbWUucGFnZSgpID8gbV9mcmFtZS5wYWdlKCkt PnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwogICAgIGNvbnN0IFVSTCYgaGlzdG9yeVVS TCA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpOwog CiAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1wdHkoKSAmJiAhbmVlZFByaXZhY3kpIHsK 321103 2017-09-18 10:12:05 -0700 2017-09-18 11:01:51 -0700 Patch bug-177071-20170918191204.patch text/plain 3666 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjE1OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA5LTE4ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV0sxXSBMYXlvdXQgVGVz dCBmYXN0L2V2ZW50cy9iZWZvcmV1bmxvYWQtZG9tLW1hbmlwdWxhdGlvbi1jcmFzaC5odG1sIGlz IGNyYXNoaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc3MDcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlIFBhZ2UgcG9pbnRlciBpbiB0aGUgaGlzdG9yeSBjb250cm9sbGVyJ3MgZnJhbWUgaXMg bnVsbC4gQWRkIGEgbnVsbCBwb2ludGVyIGNoZWNrIGJlZm9yZQorICAgICAgICBhY2Nlc3Npbmcg dGhlIHBhZ2UuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGl0aW5nIHRl c3RzLgorCisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JTdGFuZGFyZExvYWQpOgorICAg ICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclJlZGlyZWN0V2l0aExv Y2tlZEJhY2tGb3J3YXJkTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5Q29udHJvbGxl cjo6dXBkYXRlRm9yQ2xpZW50UmVkaXJlY3QpOgorCiAyMDE3LTA5LTE3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMjE5 NzQpOiBbSGFyZmJ1enpdIFRlc3QgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvaGVicmV3LXNlbGVj dGlvbi5odG1sIGlzIGZhaWxpbmcgc2luY2UgcjIyMTk3NApJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAyMjIxNDgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zODEsNyArMzgxLDcgQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6dXBkYXRlRm9yU3RhbmRh cgogCiAgICAgRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyID0gbV9mcmFtZS5sb2FkZXIoKTsKIAot ICAgIGJvb2wgbmVlZFByaXZhY3kgPSBtX2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKTsKKyAgICBib29sIG5lZWRQcml2YWN5ID0gbV9mcmFtZS5wYWdlKCkgPyBtX2ZyYW1lLnBh Z2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKSA6IHRydWU7CiAgICAgY29uc3QgVVJMJiBoaXN0 b3J5VVJMID0gZnJhbWVMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpOwog CiAgICAgaWYgKCFmcmFtZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0 KCkpIHsKQEAgLTQxNSw3ICs0MTUsNyBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVG b3JSZWRpcmVjCiB7CiAgICAgTE9HKEhpc3RvcnksICJIaXN0b3J5Q29udHJvbGxlciAlcCB1cGRh dGVGb3JSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q6IFVwZGF0aW5nIEhpc3Rvcnkg Zm9yIHJlZGlyZWN0IGxvYWQgaW4gZnJhbWUgJXAgKG1haW4gZnJhbWUgJWQpICVzIiwgdGhpcywg Jm1fZnJhbWUsIG1fZnJhbWUuaXNNYWluRnJhbWUoKSwgbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVu dExvYWRlcigpID8gbV9mcmFtZS5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT51cmwoKS5zdHJp bmcoKS51dGY4KCkuZGF0YSgpIDogIiIpOwogICAgIAotICAgIGJvb2wgbmVlZFByaXZhY3kgPSBt X2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKTsKKyAgICBib29sIG5lZWRQcml2 YWN5ID0gbV9mcmFtZS5wYWdlKCkgPyBtX2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Np b24oKSA6IHRydWU7CiAgICAgY29uc3QgVVJMJiBoaXN0b3J5VVJMID0gbV9mcmFtZS5sb2FkZXIo KS5kb2N1bWVudExvYWRlcigpLT51cmxGb3JIaXN0b3J5KCk7CiAKICAgICBpZiAobV9mcmFtZS5s b2FkZXIoKS5kb2N1bWVudExvYWRlcigpLT5pc0NsaWVudFJlZGlyZWN0KCkpIHsKQEAgLTQ2MCw3 ICs0NjAsNyBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjp1cGRhdGVGb3JDbGllbnRSCiAgICAg ICAgIG1fY3VycmVudEl0ZW0tPmNsZWFyU2Nyb2xsUG9zaXRpb24oKTsKICAgICB9CiAKLSAgICBi b29sIG5lZWRQcml2YWN5ID0gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7 CisgICAgYm9vbCBuZWVkUHJpdmFjeSA9IG1fZnJhbWUucGFnZSgpID8gbV9mcmFtZS5wYWdlKCkt PnVzZXNFcGhlbWVyYWxTZXNzaW9uKCkgOiB0cnVlOwogICAgIGNvbnN0IFVSTCYgaGlzdG9yeVVS TCA9IG1fZnJhbWUubG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsRm9ySGlzdG9yeSgpOwog CiAgICAgaWYgKCFoaXN0b3J5VVJMLmlzRW1wdHkoKSAmJiAhbmVlZFByaXZhY3kpIHsKQEAgLTU0 OSwxMyArNTQ5LDEzIEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUZvclNhbWVEb2MK ICAgICBpZiAobV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmIChtX2ZyYW1lLnBhZ2UoKS0+dXNlc0VwaGVtZXJhbFNlc3Npb24oKSkK LSAgICAgICAgcmV0dXJuOwotCiAgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwogICAg IGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKHBhZ2UtPnVzZXNFcGhlbWVy YWxTZXNzaW9uKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIGFkZFZpc2l0ZWRMaW5rKCpwYWdl LCBtX2ZyYW1lLmRvY3VtZW50KCktPnVybCgpKTsKICAgICBtX2ZyYW1lLm1haW5GcmFtZSgpLmxv YWRlcigpLmhpc3RvcnkoKS5yZWN1cnNpdmVVcGRhdGVGb3JTYW1lRG9jdW1lbnROYXZpZ2F0aW9u KCk7CiAKQEAgLTg5MywxMCArODkzLDEwIEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnJlcGxh Y2VTdGF0ZShSZWYKICAgICBtX2N1cnJlbnRJdGVtLT5zZXRGb3JtRGF0YShudWxscHRyKTsKICAg ICBtX2N1cnJlbnRJdGVtLT5zZXRGb3JtQ29udGVudFR5cGUoU3RyaW5nKCkpOwogCisgICAgQVNT RVJUKG1fZnJhbWUucGFnZSgpKTsKICAgICBpZiAobV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVy YWxTZXNzaW9uKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVChtX2ZyYW1lLnBhZ2Uo KSk7CiAgICAgYWRkVmlzaXRlZExpbmsoKm1fZnJhbWUucGFnZSgpLCBVUkwoUGFyc2VkVVJMU3Ry aW5nLCB1cmxTdHJpbmcpKTsKICAgICBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLnVwZGF0ZUds b2JhbEhpc3RvcnkoKTsKIH0K