31805 2009-11-23 07:26:59 -0800 [V8] Don't crash when OOM in creating isolated world 2009-11-23 11:12:16 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned ager antonm dglazkov oldest_to_newest 165851 0 abarth 2009-11-23 07:26:59 -0800 Thread 0 *CRASHED* ( EXCEPTION_ACCESS_VIOLATION @ 0x00000000 ) 0x01a936fd [chrome.dll - api.cc:476] v8::Context::GetData() 0x015a6cae [chrome.dll - v8proxy.cpp:385] WebCore::V8Proxy::setInjectedScriptContextDebugId(v8::Handle<v8::Context>) 0x015a6a92 [chrome.dll - v8proxy.cpp:314] WebCore::V8Proxy::evaluateInIsolatedWorld(int,WTF::Vector<WebCore::ScriptSourceCode,0> const &,int) 0x018329d9 [chrome.dll - webframeimpl.cpp:596] WebKit::WebFrameImpl::executeScriptInIsolatedWorld(int,WebKit::WebScriptSource const *,unsigned int,int) 0x01376e51 [chrome.dll - user_script_slave.cc:188] UserScriptSlave::InjectScripts(WebKit::WebFrame *,UserScript::RunLocation) 0x0136d000 [chrome.dll - render_view.cc:2320] RenderView::OnUserScriptIdleTriggered(WebKit::WebFrame *) 0x0138e482 [chrome.dll - user_script_idle_scheduler.cc:44] UserScriptIdleScheduler::MaybeRun() 0x015915b9 [chrome.dll - task.h:147] ScopedRunnableMethodFactory<appcache::MockAppCacheStorage>::RunnableMethod<void ( appcache::MockAppCacheStorage::*)(void),Tuple0>::Run() 0x01345f5d [chrome.dll - message_loop.cc:320] MessageLoop::RunTask(Task *) 0x01345f97 [chrome.dll - message_loop.cc:328] MessageLoop::DeferOrRunPendingTask(MessageLoop::PendingTask const &) 0x0134614c [chrome.dll - message_loop.cc:435] MessageLoop::DoWork() 0x01356f46 [chrome.dll - message_pump_default.cc:50] base::MessagePumpDefault::Run(base::MessagePump::Delegate *) 0x01345e0d [chrome.dll - message_loop.cc:205] MessageLoop::RunInternal() 0x01345d92 [chrome.dll - message_loop.cc:177] MessageLoop::RunHandler() 0x01345d43 [chrome.dll - message_loop.cc:155] MessageLoop::Run() 0x0135e9ca [chrome.dll - renderer_main.cc:139] RendererMain(MainFunctionParams const &) 0x012b37fb [chrome.dll - chrome_dll_main.cc:565] ChromeMain 0x01222f02 [chrome.exe - client_util.cc:170] MainDllLoader::Launch(HINSTANCE__ *,sandbox::SandboxInterfaceInfo *) 0x01223548 [chrome.exe - chrome_exe_main.cc:47] wWinMain 0x01247949 [chrome.exe - crt0.c:324] __tmainCRTStartup 0x77333676 [kernel32.dll + 0x00013676] BaseThreadInitThunk 0x77d59d71 [ntdll.dll + 0x00039d71] __RtlUserThreadStart 0x77d59d44 [ntdll.dll + 0x00039d44] _RtlUserThreadStart 165852 1 43715 abarth 2009-11-23 07:37:39 -0800 Created attachment 43715 Patch 165857 2 antonm 2009-11-23 08:18:35 -0800 (In reply to comment #1) > Created an attachment (id=43715) [details] > Patch I thought that we crash in this line: v8::Handle<v8::Value> windowContextData = m_context->GetData(); shouldn't we add if (m_context.IsEmpty()) check above as well? 165859 3 43717 abarth 2009-11-23 08:23:41 -0800 Created attachment 43717 Patch 165860 4 abarth 2009-11-23 08:24:40 -0800 Right you are! 165861 5 43717 antonm 2009-11-23 08:25:23 -0800 Comment on attachment 43717 Patch Thanks a lot. 165862 6 43717 abarth 2009-11-23 08:42:02 -0800 Comment on attachment 43717 Patch Thanks Anton, but according to committers.py, you're not a reviewer (yet!). We still need an official reviewer to sign off on this patch. 165864 7 43717 dglazkov 2009-11-23 08:50:12 -0800 Comment on attachment 43717 Patch r=me. 165884 8 abarth 2009-11-23 11:12:16 -0800 Committed r51312: <http://trac.webkit.org/changeset/51312> 43715 2009-11-23 07:37:39 -0800 2009-11-23 08:23:18 -0800 Patch bug-31805-20091123073734.patch text/plain 4048 abarth PyAgICAgICB1bmxvYWQucGF0Y2gKPyAgICAgICBwYXRjaHkKPyAgICAgICBjbGVhci1pbnRlcnZh bC5wYXRjaAo/ICAgICAgIHNjaGVkdWxlZC1hY3Rpb24ucGF0Y2gKPyAgICAgICBXZWJDb3JlL2Jp bmRpbmdzL3Y4L2NzY29wZS5vdXQKPyAgICAgICBMYXlvdXRUZXN0cy9mYXN0L2RvbS90aW1lci1j bGVhci1pbnRlcnZhbC1pbi1oYW5kbGVyLWFuZC10b3VjaC1kb20uaHRtbApJbmRleDogV2ViQ29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUx MzA4KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBA QAorMjAwOS0xMS0yMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRG9uJ3QgY3Jhc2gg d2hlbiBPT00gaW4gY3JlYXRpbmcgaXNvbGF0ZWQgd29ybGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxODA1CisKKyAgICAgICAgV2UgbmVlZCB0byBh ZGQgc29tZSBtb3JlIG51bGwgY2hlY2tzIHRvIGF2b2lkIGNyYXNoaW5nLiAgTm8gbmV3IHRlc3Rz CisgICAgICAgIGJlY2F1c2Ugd2UgZG9uJ3QgaGF2ZSBhIGdvb2Qgd2F5IHRvIHRlc3Qgb3V0LW9m LW1lbW9yeSBidWdzLgorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOFByb3h5OjpldmFsdWF0ZUluSXNvbGF0ZWRXb3JsZCk6CisgICAgICAg IChXZWJDb3JlOjpWOFByb3h5OjpldmFsdWF0ZUluTmV3Q29udGV4dCk6CisgICAgICAgIChXZWJD b3JlOjpWOFByb3h5OjpzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKToKKyAgICAgICAg KiBiaW5kaW5ncy92OC9WOFByb3h5Lmg6CisKIDIwMDktMTEtMjMgIFNpbW9uIEhhdXNtYW5uICA8 c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCShyZXZpc2lv biA1MTIwMSkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMxMSw3ICszMTEsMTEgQEAgdm9pZCBWOFByb3h5OjpldmFsdWF0ZUluSXNvbGF0ZWRX b3JsZChpbgogICAgICAgICAgICAgbV9pc29sYXRlZFdvcmxkcy5zZXQod29ybGRJRCwgd29ybGQp OwogCiAgICAgICAgICAgICAvLyBTZXR1cCBjb250ZXh0IGlkIGZvciBKUyBkZWJ1Z2dlci4KLSAg ICAgICAgICAgIHNldEluamVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQod29ybGQtPmNvbnRleHQo KSk7CisgICAgICAgICAgICBpZiAoIXNldEluamVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQod29y bGQtPmNvbnRleHQoKSkpIHsKKyAgICAgICAgICAgICAgICBtX2lzb2xhdGVkV29ybGRzLnRha2Uo d29ybGRJRCk7CisgICAgICAgICAgICAgICAgZGVsZXRlIHdvcmxkOworICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAg IHdvcmxkID0gbmV3IFY4SXNvbGF0ZWRXb3JsZCh0aGlzLCBleHRlbnNpb25Hcm91cCk7CkBAIC0z NTAsNyArMzU0LDEwIEBAIHZvaWQgVjhQcm94eTo6ZXZhbHVhdGVJbk5ld0NvbnRleHQoY29uc3QK ICAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4dFNjb3BlKGNvbnRleHQpOwogCiAgICAgLy8g U2V0dXAgY29udGV4dCBpZCBmb3IgSlMgZGVidWdnZXIuCi0gICAgc2V0SW5qZWN0ZWRTY3JpcHRD b250ZXh0RGVidWdJZChjb250ZXh0KTsKKyAgICBpZiAoIXNldEluamVjdGVkU2NyaXB0Q29udGV4 dERlYnVnSWQoY29udGV4dCkpIHsKKyAgICAgICAgY29udGV4dC5EaXNwb3NlKCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9IGNv bnRleHQtPkdsb2JhbCgpOwogCkBAIC0zNzYsMTkgKzM4MywyNyBAQCB2b2lkIFY4UHJveHk6OmV2 YWx1YXRlSW5OZXdDb250ZXh0KGNvbnN0CiAgICAgY29udGV4dC5EaXNwb3NlKCk7CiB9CiAKLXZv aWQgVjhQcm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4 OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0KQorYm9vbCBWOFByb3h5OjpzZXRJbmplY3RlZFNjcmlw dENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpCiB7 CiAgICAgLy8gU2V0dXAgY29udGV4dCBpZCBmb3IgSlMgZGVidWdnZXIuCiAgICAgdjg6OkNvbnRl eHQ6OlNjb3BlIGNvbnRleHRTY29wZSh0YXJnZXRDb250ZXh0KTsKICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGNvbnRleHREYXRhID0gdjg6Ok9iamVjdDo6TmV3KCk7CisgICAgaWYgKGNvbnRl eHREYXRhLklzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IHdpbmRvd0NvbnRleHREYXRhID0gbV9jb250ZXh0LT5HZXREYXRhKCk7CiAg ICAgaWYgKHdpbmRvd0NvbnRleHREYXRhLT5Jc09iamVjdCgpKSB7CiAgICAgICAgIHY4OjpIYW5k bGU8djg6OlN0cmluZz4gcHJvcGVydHlOYW1lID0gdjg6OlN0cmluZzo6TmV3KGtDb250ZXh0RGVi dWdEYXRhVmFsdWUpOworICAgICAgICBpZiAocHJvcGVydHlOYW1lLklzRW1weSgpKQorICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBjb250ZXh0RGF0YS0+U2V0KHByb3BlcnR5TmFt ZSwgdjg6Ok9iamVjdDo6Q2FzdCgqd2luZG93Q29udGV4dERhdGEpLT5HZXQocHJvcGVydHlOYW1l KSk7CiAgICAgfQotICAgIGNvbnRleHREYXRhLT5TZXQodjg6OlN0cmluZzo6TmV3KGtDb250ZXh0 RGVidWdEYXRhVHlwZSksIHY4OjpTdHJpbmc6Ok5ldygiaW5qZWN0ZWQiKSk7CisgICAgdjg6Okhh bmRsZTx2ODo6U3RyaW5nPiBwcm9wZXJ0eU5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoa0NvbnRleHRE ZWJ1Z0RhdGFUeXBlKTsKKyAgICBpZiAocHJvcGVydHlOYW1lLklzRW1weSgpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgY29udGV4dERhdGEtPlNldChwcm9wZXJ0eU5hbWUsIHY4OjpTdHJp bmc6Ok5ldygiaW5qZWN0ZWQiKSk7CiAgICAgdGFyZ2V0Q29udGV4dC0+U2V0RGF0YShjb250ZXh0 RGF0YSk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJv eHk6OmV2YWx1YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZSwgTm9kZSogbm9kZSkK SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvdjgvVjhQcm94eS5oCShyZXZpc2lvbiA1MTIwMSkKKysrIFdlYkNvcmUvYmlu ZGluZ3MvdjgvVjhQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zODcsNyArMzg3LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgcmVzZXRJc29sYXRlZFdvcmxkcygpOwog Ci0gICAgICAgIHZvaWQgc2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxl PHY4OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0KTsKKyAgICAgICAgLy8gUmV0dXJucyBmYWxzZSB3 aGVuIHdlJ3JlIG91dCBvZiBtZW1vcnkgaW4gVjguCisgICAgICAgIGJvb2wgc2V0SW5qZWN0ZWRT Y3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0 KTsKIAogICAgICAgICBzdGF0aWMgYm9vbCBjYW5BY2Nlc3NQcml2YXRlKERPTVdpbmRvdyopOwog Cg== 43717 2009-11-23 08:23:41 -0800 2009-11-23 09:35:57 -0800 Patch bug-31805-20091123082339.patch text/plain 4101 abarth PyAgICAgICB1bmxvYWQucGF0Y2gKPyAgICAgICBwYXRjaHkKPyAgICAgICBjbGVhci1pbnRlcnZh bC5wYXRjaAo/ICAgICAgIHNjaGVkdWxlZC1hY3Rpb24ucGF0Y2gKPyAgICAgICBXZWJDb3JlL2Jp bmRpbmdzL3Y4L2NzY29wZS5vdXQKPyAgICAgICBMYXlvdXRUZXN0cy9mYXN0L2RvbS90aW1lci1j bGVhci1pbnRlcnZhbC1pbi1oYW5kbGVyLWFuZC10b3VjaC1kb20uaHRtbApJbmRleDogV2ViQ29y ZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUx MzA4KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBA QAorMjAwOS0xMS0yMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtWOF0gRG9uJ3QgY3Jhc2gg d2hlbiBPT00gaW4gY3JlYXRpbmcgaXNvbGF0ZWQgd29ybGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxODA1CisKKyAgICAgICAgV2UgbmVlZCB0byBh ZGQgc29tZSBtb3JlIG51bGwgY2hlY2tzIHRvIGF2b2lkIGNyYXNoaW5nLiAgTm8gbmV3IHRlc3Rz CisgICAgICAgIGJlY2F1c2Ugd2UgZG9uJ3QgaGF2ZSBhIGdvb2Qgd2F5IHRvIHRlc3Qgb3V0LW9m LW1lbW9yeSBidWdzLgorCisgICAgICAgICogYmluZGluZ3MvdjgvVjhQcm94eS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpWOFByb3h5OjpldmFsdWF0ZUluSXNvbGF0ZWRXb3JsZCk6CisgICAgICAg IChXZWJDb3JlOjpWOFByb3h5OjpldmFsdWF0ZUluTmV3Q29udGV4dCk6CisgICAgICAgIChXZWJD b3JlOjpWOFByb3h5OjpzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKToKKyAgICAgICAg KiBiaW5kaW5ncy92OC9WOFByb3h5Lmg6CisKIDIwMDktMTEtMjMgIFNpbW9uIEhhdXNtYW5uICA8 c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCShyZXZpc2lv biA1MTIwMSkKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMxMSw3ICszMTEsMTEgQEAgdm9pZCBWOFByb3h5OjpldmFsdWF0ZUluSXNvbGF0ZWRX b3JsZChpbgogICAgICAgICAgICAgbV9pc29sYXRlZFdvcmxkcy5zZXQod29ybGRJRCwgd29ybGQp OwogCiAgICAgICAgICAgICAvLyBTZXR1cCBjb250ZXh0IGlkIGZvciBKUyBkZWJ1Z2dlci4KLSAg ICAgICAgICAgIHNldEluamVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQod29ybGQtPmNvbnRleHQo KSk7CisgICAgICAgICAgICBpZiAoIXNldEluamVjdGVkU2NyaXB0Q29udGV4dERlYnVnSWQod29y bGQtPmNvbnRleHQoKSkpIHsKKyAgICAgICAgICAgICAgICBtX2lzb2xhdGVkV29ybGRzLnRha2Uo d29ybGRJRCk7CisgICAgICAgICAgICAgICAgZGVsZXRlIHdvcmxkOworICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAg IHdvcmxkID0gbmV3IFY4SXNvbGF0ZWRXb3JsZCh0aGlzLCBleHRlbnNpb25Hcm91cCk7CkBAIC0z NTAsNyArMzU0LDEwIEBAIHZvaWQgVjhQcm94eTo6ZXZhbHVhdGVJbk5ld0NvbnRleHQoY29uc3QK ICAgICB2ODo6Q29udGV4dDo6U2NvcGUgY29udGV4dFNjb3BlKGNvbnRleHQpOwogCiAgICAgLy8g U2V0dXAgY29udGV4dCBpZCBmb3IgSlMgZGVidWdnZXIuCi0gICAgc2V0SW5qZWN0ZWRTY3JpcHRD b250ZXh0RGVidWdJZChjb250ZXh0KTsKKyAgICBpZiAoIXNldEluamVjdGVkU2NyaXB0Q29udGV4 dERlYnVnSWQoY29udGV4dCkpIHsKKyAgICAgICAgY29udGV4dC5EaXNwb3NlKCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9IGNv bnRleHQtPkdsb2JhbCgpOwogCkBAIC0zNzYsMTkgKzM4MywyOSBAQCB2b2lkIFY4UHJveHk6OmV2 YWx1YXRlSW5OZXdDb250ZXh0KGNvbnN0CiAgICAgY29udGV4dC5EaXNwb3NlKCk7CiB9CiAKLXZv aWQgVjhQcm94eTo6c2V0SW5qZWN0ZWRTY3JpcHRDb250ZXh0RGVidWdJZCh2ODo6SGFuZGxlPHY4 OjpDb250ZXh0PiB0YXJnZXRDb250ZXh0KQorYm9vbCBWOFByb3h5OjpzZXRJbmplY3RlZFNjcmlw dENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpCiB7 CiAgICAgLy8gU2V0dXAgY29udGV4dCBpZCBmb3IgSlMgZGVidWdnZXIuCiAgICAgdjg6OkNvbnRl eHQ6OlNjb3BlIGNvbnRleHRTY29wZSh0YXJnZXRDb250ZXh0KTsKICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGNvbnRleHREYXRhID0gdjg6Ok9iamVjdDo6TmV3KCk7CisgICAgaWYgKGNvbnRl eHREYXRhLklzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKG1fY29u dGV4dC5Jc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gd2luZG93Q29udGV4dERhdGEgPSBtX2NvbnRleHQtPkdldERhdGEoKTsKICAgICBp ZiAod2luZG93Q29udGV4dERhdGEtPklzT2JqZWN0KCkpIHsKICAgICAgICAgdjg6OkhhbmRsZTx2 ODo6U3RyaW5nPiBwcm9wZXJ0eU5hbWUgPSB2ODo6U3RyaW5nOjpOZXcoa0NvbnRleHREZWJ1Z0Rh dGFWYWx1ZSk7CisgICAgICAgIGlmIChwcm9wZXJ0eU5hbWUuSXNFbXB5KCkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGNvbnRleHREYXRhLT5TZXQocHJvcGVydHlOYW1lLCB2 ODo6T2JqZWN0OjpDYXN0KCp3aW5kb3dDb250ZXh0RGF0YSktPkdldChwcm9wZXJ0eU5hbWUpKTsK ICAgICB9Ci0gICAgY29udGV4dERhdGEtPlNldCh2ODo6U3RyaW5nOjpOZXcoa0NvbnRleHREZWJ1 Z0RhdGFUeXBlKSwgdjg6OlN0cmluZzo6TmV3KCJpbmplY3RlZCIpKTsKKyAgICB2ODo6SGFuZGxl PHY4OjpTdHJpbmc+IHByb3BlcnR5TmFtZSA9IHY4OjpTdHJpbmc6Ok5ldyhrQ29udGV4dERlYnVn RGF0YVR5cGUpOworICAgIGlmIChwcm9wZXJ0eU5hbWUuSXNFbXB5KCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBjb250ZXh0RGF0YS0+U2V0KHByb3BlcnR5TmFtZSwgdjg6OlN0cmluZzo6 TmV3KCJpbmplY3RlZCIpKTsKICAgICB0YXJnZXRDb250ZXh0LT5TZXREYXRhKGNvbnRleHREYXRh KTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6 ZXZhbHVhdGUoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlLCBOb2RlKiBub2RlKQpJbmRl eDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9i aW5kaW5ncy92OC9WOFByb3h5LmgJKHJldmlzaW9uIDUxMjAxKQorKysgV2ViQ29yZS9iaW5kaW5n cy92OC9WOFByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM4Nyw3ICszODcsOCBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCByZXNldElzb2xhdGVkV29ybGRzKCk7CiAKLSAg ICAgICAgdm9pZCBzZXRJbmplY3RlZFNjcmlwdENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6 OkNvbnRleHQ+IHRhcmdldENvbnRleHQpOworICAgICAgICAvLyBSZXR1cm5zIGZhbHNlIHdoZW4g d2UncmUgb3V0IG9mIG1lbW9yeSBpbiBWOC4KKyAgICAgICAgYm9vbCBzZXRJbmplY3RlZFNjcmlw dENvbnRleHREZWJ1Z0lkKHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHRhcmdldENvbnRleHQpOwog CiAgICAgICAgIHN0YXRpYyBib29sIGNhbkFjY2Vzc1ByaXZhdGUoRE9NV2luZG93Kik7CiAK