140968 2015-01-27 16:33:46 -0800 Web Inspector: Crash when closing inspected page 2015-01-28 13:24:18 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1064721 0 joepeck 2015-01-27 16:33:46 -0800 * SUMMARY WebContentProcess crash when closing inspected page. * STEPS TO REPRODUCE 1. Login to iCloud.com 2. Open Pages 3. Create a new file in that app (causes a new tab to be made) 4. Open inspector in new tab 5. Close new tab => CRASH * CRASH: Exception Type: EXC_BAD_ACCESS (SIGSEGV) Exception Codes: KERN_INVALID_ADDRESS at 0x0000000000000070 Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebKit 0x000000010ec6828b WebCore::Page::inspectorController() const + 43 1 com.apple.WebKit 0x000000010ec66cc1 WebKit::WebInspector::close() + 33 2 com.apple.WebKit 0x000000010ec6a339 WebKit::WebInspector::didClose(IPC::Connection&) + 25 3 com.apple.WebKit 0x000000010ec6a3ff non-virtual thunk to WebKit::WebInspector::didClose(IPC::Connection&) + 47 4 com.apple.WebKit 0x000000010e6b63fa IPC::Connection::connectionDidClose()::$_4::operator()() const + 122 5 com.apple.WebKit 0x000000010e6b636c std::__1::__function::__func<IPC::Connection::connectionDidClose()::$_4, std::__1::allocator<IPC::Connection::connectionDidClose()::$_4>, void ()>::operator()() + 60 6 com.apple.JavaScriptCore 0x0000000111d725ea std::__1::function<void ()>::operator()() const + 26 (functional:1755) 7 com.apple.JavaScriptCore 0x0000000111e000f1 WTF::RunLoop::performWork() + 561 (RunLoop.cpp:106) 8 com.apple.JavaScriptCore 0x0000000111e01424 WTF::RunLoop::performWork(void*) + 36 (RunLoopCF.cpp:38) ... * NOTES (lldb) up frame #2: 0x000000010ec66cc1 WebKit`WebKit::WebInspector::close(this=0x00007fec72fb43d8) + 33 at WebInspector.cpp:122 119 120 void WebInspector::close() 121 { -> 122 m_page->corePage()->inspectorController().close(); 123 } 124 125 void WebInspector::openInNewTab(const String& urlString) (lldb) p m_page->corePage() (WebCore::Page *) $1 = 0x0000000000000000 1064722 1 joepeck 2015-01-27 16:34:03 -0800 <rdar://problem/19194743> 1064724 2 245492 joepeck 2015-01-27 16:36:02 -0800 Created attachment 245492 [PATCH] Proposed Fix 1064739 3 245492 joepeck 2015-01-27 17:14:49 -0800 Comment on attachment 245492 [PATCH] Proposed Fix I was also able to get this to happen on sendMessageToBackend. Seems we should do this in more places. I'll just check everywhere. Exception Type: EXC_BAD_ACCESS (SIGSEGV) Exception Codes: KERN_INVALID_ADDRESS at 0x0000000000000070 Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebKit 0x0000000113eac28b WebCore::Page::inspectorController() const + 43 1 com.apple.WebKit 0x0000000113eab325 WebKit::WebInspector::sendMessageToBackend(WTF::String const&) + 37 2 com.apple.WebKit 0x0000000113eb620f void IPC::callMemberFunctionImpl<WebKit::WebInspector, void (WebKit::WebInspector::*)(WTF::String const&), std::__1::tuple<WTF::String>, 0ul>(WebKit::WebInspector*, void (WebKit::WebInspector::*)(WTF::String const&), std::__1::tuple<WTF::String>&&, std::index_sequence<0ul>) + 159 3 com.apple.WebKit 0x0000000113eb6168 void IPC::callMemberFunction<WebKit::WebInspector, void (WebKit::WebInspector::*)(WTF::String const&), std::__1::tuple<WTF::String>, std::make_index_sequence<1ul> >(std::__1::tuple<WTF::String>&&, WebKit::WebInspector*, void (WebKit::WebInspector::*)(WTF::String const&)) + 88 4 com.apple.WebKit 0x0000000113eb60d6 void IPC::handleMessage<Messages::WebInspector::SendMessageToBackend, WebKit::WebInspector, void (WebKit::WebInspector::*)(WTF::String const&)>(IPC::MessageDecoder&, WebKit::WebInspector*, void (WebKit::WebInspector::*)(WTF::String const&)) + 230 5 com.apple.WebKit 0x0000000113eb560a WebKit::WebInspector::didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) + 1306 6 com.apple.WebKit 0x0000000113eb5677 non-virtual thunk to WebKit::WebInspector::didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) + 55 ... 1064754 4 245499 joepeck 2015-01-27 18:22:53 -0800 Created attachment 245499 [PATCH] Proposed Fix 1064798 5 245499 timothy 2015-01-27 20:55:20 -0800 Comment on attachment 245499 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=245499&action=review > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:262 > + if (m_page->corePage()) { Why no early return? > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:273 > + if (m_page->corePage()) Could store corePage in a local here and use on the next line. 1065007 6 joepeck 2015-01-28 12:59:38 -0800 (In reply to comment #5) > Comment on attachment 245499 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=245499&action=review > > > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:262 > > + if (m_page->corePage()) { > > Why no early return? > > > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:273 > > + if (m_page->corePage()) > > Could store corePage in a local here and use on the next line. These two match in style because they are slightly different than the others. As for storing into a local, I think the compiler is smart enough to do that for us here. 1065013 7 245499 commit-queue 2015-01-28 13:24:13 -0800 Comment on attachment 245499 [PATCH] Proposed Fix Clearing flags on attachment: 245499 Committed r179282: <http://trac.webkit.org/changeset/179282> 1065014 8 commit-queue 2015-01-28 13:24:18 -0800 All reviewed patches have been landed. Closing bug. 245492 2015-01-27 16:36:02 -0800 2015-01-27 18:22:53 -0800 [PATCH] Proposed Fix null-check.patch text/plain 1297 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0YmI4NTcyLi5mZTY4ZmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTUtMDEtMjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDcmFzaCB3aGVuIGNsb3NpbmcgaW5zcGVjdGVkIHBhZ2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDk2OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3Bl Y3Rvcjo6Y2xvc2UpOgorICAgICAgICBjbG9zZSgpIGdldHMgY2FsbGVkIGluIHJlYWN0aW9uIHRv IGEgbnVtYmVyIG9mIGV2ZW50cywgc3VjaCBhcyBhbmQKKyAgICAgICAgSVBDOjpDb25uZWN0aW9u IGNsb3NpbmcuIEluIHRob3NlIGNhc2VzLCB0aGUgY29yZVBhZ2UgY291bGQgYmUgZGVzdHJveWVk LgorCiAyMDE1LTAxLTI3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAg ICBJbnZva2luZyBhbiBpbW1lZGlhdGUgYWN0aW9uIG9uIGxpbmsgb2Z0ZW4gZGlzbWlzc2VzIHNl bGVjdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl Ykluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5z cGVjdG9yLmNwcAppbmRleCA0YWFkZjcwLi45NjhjNDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcApAQCAtMTE5LDcgKzExOSw4 IEBAIHZvaWQgV2ViSW5zcGVjdG9yOjpzaG93KCkKIAogdm9pZCBXZWJJbnNwZWN0b3I6OmNsb3Nl KCkKIHsKLSAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5jbG9z ZSgpOworICAgIGlmIChtX3BhZ2UtPmNvcmVQYWdlKCkpCisgICAgICAgIG1fcGFnZS0+Y29yZVBh Z2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLmNsb3NlKCk7CiB9CiAKIHZvaWQgV2ViSW5zcGVj dG9yOjpvcGVuSW5OZXdUYWIoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCg== 245499 2015-01-27 18:22:53 -0800 2015-01-28 13:24:13 -0800 [PATCH] Proposed Fix null-check.patch text/plain 5532 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0YmI4NTcyLi4zZDJhY2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTUtMDEtMjcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDcmFzaCB3aGVuIGNsb3NpbmcgaW5zcGVjdGVkIHBhZ2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDk2OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBj YXNlcyB3aGVyZSB0aGUgY29yZVBhZ2UgY291bGQgYmUgbnVsbC4gV2l0aCB0aGUgSW5zcGVjdG9y IFByb2Nlc3MKKyAgICAgICAgaW4gaXRzIG93biBwcm9jZXNzLCBtZXNzYWdlcyBtYXkgY29tZSB0 byB0aGUgV2ViQ29udGVudFByb2Nlc3MgYWZ0ZXIKKyAgICAgICAgdGhlIFdlYkNvcmU6OlBhZ2Ug aGFzIGl0c2VsZiBiZWVuIGRlc3Ryb3llZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJJbnNwZWN0b3IuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OnNob3cp OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OmNsb3NlKToKKyAgICAgICAgKFdlYktp dDo6V2ViSW5zcGVjdG9yOjpvcGVuSW5OZXdUYWIpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3I6OmV2YWx1YXRlU2NyaXB0Rm9yVGVzdCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3Bl Y3Rvcjo6c2hvd0NvbnNvbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OnNob3dS ZXNvdXJjZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OnNob3dNYWluUmVzb3Vy Y2VGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6c3RhcnRQYWdlUHJv ZmlsaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yOjpzdG9wUGFnZVByb2ZpbGlu Zyk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6Y2FuQXR0YWNoV2luZG93KToKKyAg ICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yOjpzZW5kTWVzc2FnZVRvQmFja2VuZCk6CisgICAg ICAgIChXZWJLaXQ6OldlYkluc3BlY3Rvcjo6cmVtb3RlRnJvbnRlbmRDb25uZWN0ZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3I6OnJlbW90ZUZyb250ZW5kRGlzY29ubmVjdGVkKToK KwogMjAxNS0wMS0yNyAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAg SW52b2tpbmcgYW4gaW1tZWRpYXRlIGFjdGlvbiBvbiBsaW5rIG9mdGVuIGRpc21pc3NlcyBzZWxl Y3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJ bnNwZWN0b3IuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3Bl Y3Rvci5jcHAKaW5kZXggNGFhZGY3MC4uZjQyNGRiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAKQEAgLTExNCwxNyArMTE0LDI2 IEBAIHZvaWQgV2ViSW5zcGVjdG9yOjpicmluZ1RvRnJvbnQoKQogLy8gQ2FsbGVkIGJ5IFdlYklu c3BlY3RvciBtZXNzYWdlcwogdm9pZCBXZWJJbnNwZWN0b3I6OnNob3coKQogeworICAgIGlmICgh bV9wYWdlLT5jb3JlUGFnZSgpKQorICAgICAgICByZXR1cm47CisKICAgICBtX3BhZ2UtPmNvcmVQ YWdlKCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5zaG93KCk7CiB9CiAKIHZvaWQgV2ViSW5zcGVj dG9yOjpjbG9zZSgpCiB7CisgICAgaWYgKCFtX3BhZ2UtPmNvcmVQYWdlKCkpCisgICAgICAgIHJl dHVybjsKKwogICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLmNs b3NlKCk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpvcGVuSW5OZXdUYWIoY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcpCiB7CiAgICAgUGFnZSogaW5zcGVjdGVkUGFnZSA9IG1fcGFnZS0+Y29yZVBh Z2UoKTsKKyAgICBpZiAoIWluc3BlY3RlZFBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIEZy YW1lJiBpbnNwZWN0ZWRNYWluRnJhbWUgPSBpbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKTsKICAg ICBGcmFtZUxvYWRSZXF1ZXN0IHJlcXVlc3QoaW5zcGVjdGVkTWFpbkZyYW1lLmRvY3VtZW50KCkt PnNlY3VyaXR5T3JpZ2luKCksIFJlc291cmNlUmVxdWVzdCh1cmxTdHJpbmcpLCAiX2JsYW5rIik7 CiAKQEAgLTEzNywxNyArMTQ2LDI2IEBAIHZvaWQgV2ViSW5zcGVjdG9yOjpvcGVuSW5OZXdUYWIo Y29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpldmFsdWF0ZVNj cmlwdEZvclRlc3QoY29uc3QgU3RyaW5nJiBzY3JpcHQpCiB7CisgICAgaWYgKCFtX3BhZ2UtPmNv cmVQYWdlKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5z cGVjdG9yQ29udHJvbGxlcigpLmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoc2NyaXB0KTsKIH0K IAogdm9pZCBXZWJJbnNwZWN0b3I6OnNob3dDb25zb2xlKCkKIHsKKyAgICBpZiAoIW1fcGFnZS0+ Y29yZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5p bnNwZWN0b3JDb250cm9sbGVyKCkuc2hvdygpOwogICAgIG1fZnJvbnRlbmRDb25uZWN0aW9uLT5z ZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSTo6U2hvd0NvbnNvbGUoKSwgMCk7CiB9CiAKIHZv aWQgV2ViSW5zcGVjdG9yOjpzaG93UmVzb3VyY2VzKCkKIHsKKyAgICBpZiAoIW1fcGFnZS0+Y29y ZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNw ZWN0b3JDb250cm9sbGVyKCkuc2hvdygpOwogICAgIG1fZnJvbnRlbmRDb25uZWN0aW9uLT5zZW5k KE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSTo6U2hvd1Jlc291cmNlcygpLCAwKTsKIH0KQEAgLTE1 OCw2ICsxNzYsOSBAQCB2b2lkIFdlYkluc3BlY3Rvcjo6c2hvd01haW5SZXNvdXJjZUZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSWRlbnRpZmllcikKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1 cm47CiAKKyAgICBpZiAoIW1fcGFnZS0+Y29yZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCiAg ICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkuc2hvdygpOwogCiAg ICAgU3RyaW5nIGluc3BlY3RvckZyYW1lSWRlbnRpZmllciA9IG1fcGFnZS0+Y29yZVBhZ2UoKS0+ aW5zcGVjdG9yQ29udHJvbGxlcigpLnBhZ2VBZ2VudCgpLT5mcmFtZUlkKGZyYW1lLT5jb3JlRnJh bWUoKSk7CkBAIC0xNjYsMTggKzE4NywyNyBAQCB2b2lkIFdlYkluc3BlY3Rvcjo6c2hvd01haW5S ZXNvdXJjZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSWRlbnRpZmllcikKIAogdm9pZCBXZWJJbnNw ZWN0b3I6OnN0YXJ0UGFnZVByb2ZpbGluZygpCiB7CisgICAgaWYgKCFtX3BhZ2UtPmNvcmVQYWdl KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIG1fcGFnZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9y Q29udHJvbGxlcigpLnNob3coKTsKICAgICBtX2Zyb250ZW5kQ29ubmVjdGlvbi0+c2VuZChNZXNz YWdlczo6V2ViSW5zcGVjdG9yVUk6OlN0YXJ0UGFnZVByb2ZpbGluZygpLCAwKTsKIH0KIAogdm9p ZCBXZWJJbnNwZWN0b3I6OnN0b3BQYWdlUHJvZmlsaW5nKCkKIHsKKyAgICBpZiAoIW1fcGFnZS0+ Y29yZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9wYWdlLT5jb3JlUGFnZSgpLT5p bnNwZWN0b3JDb250cm9sbGVyKCkuc2hvdygpOwogICAgIG1fZnJvbnRlbmRDb25uZWN0aW9uLT5z ZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3JVSTo6U3RvcFBhZ2VQcm9maWxpbmcoKSwgMCk7CiB9 CiAKIGJvb2wgV2ViSW5zcGVjdG9yOjpjYW5BdHRhY2hXaW5kb3coKQogeworICAgIGlmICghbV9w YWdlLT5jb3JlUGFnZSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAvLyBEb24ndCBh bGxvdyBhdHRhY2hpbmcgdG8gYW5vdGhlciBpbnNwZWN0b3IgLS0gdHdvIGluc3BlY3RvcnMgaW4g b25lIHdpbmRvdyBpcyB0b28gbXVjaCEKICAgICBpZiAobV9wYWdlLT5pc0luc3BlY3RvclBhZ2Uo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjA5LDYgKzIzOSw5IEBAIHZvaWQgV2ViSW5z cGVjdG9yOjp1cGRhdGVEb2NraW5nQXZhaWxhYmlsaXR5KCkKIAogdm9pZCBXZWJJbnNwZWN0b3I6 OnNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKKyAgICBpZiAo IW1fcGFnZS0+Y29yZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9wYWdlLT5jb3Jl UGFnZSgpLT5pbnNwZWN0b3JDb250cm9sbGVyKCkuZGlzcGF0Y2hNZXNzYWdlRnJvbUZyb250ZW5k KG1lc3NhZ2UpOwogfQogCkBAIC0yMjYsMTUgKzI1OSwxOSBAQCBib29sIFdlYkluc3BlY3Rvcjo6 c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKICNpZiBFTkFCTEUo SU5TUEVDVE9SX1NFUlZFUikKIHZvaWQgV2ViSW5zcGVjdG9yOjpyZW1vdGVGcm9udGVuZENvbm5l Y3RlZCgpCiB7Ci0gICAgbV9yZW1vdGVGcm9udGVuZENvbm5lY3RlZCA9IHRydWU7Ci0gICAgYm9v bCBpc0F1dG9tYXRpY0luc3BlY3Rpb24gPSBmYWxzZTsKLSAgICBtX3BhZ2UtPmNvcmVQYWdlKCkt Pmluc3BlY3RvckNvbnRyb2xsZXIoKS5jb25uZWN0RnJvbnRlbmQodGhpcywgaXNBdXRvbWF0aWNJ bnNwZWN0aW9uKTsKKyAgICBpZiAobV9wYWdlLT5jb3JlUGFnZSgpKSB7CisgICAgICAgIG1fcmVt b3RlRnJvbnRlbmRDb25uZWN0ZWQgPSB0cnVlOworICAgICAgICBib29sIGlzQXV0b21hdGljSW5z cGVjdGlvbiA9IGZhbHNlOworICAgICAgICBtX3BhZ2UtPmNvcmVQYWdlKCktPmluc3BlY3RvckNv bnRyb2xsZXIoKS5jb25uZWN0RnJvbnRlbmQodGhpcywgaXNBdXRvbWF0aWNJbnNwZWN0aW9uKTsK KyAgICB9CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yOjpyZW1vdGVGcm9udGVuZERpc2Nvbm5lY3Rl ZCgpCiB7CiAgICAgbV9yZW1vdGVGcm9udGVuZENvbm5lY3RlZCA9IGZhbHNlOwotICAgIG1fcGFn ZS0+Y29yZVBhZ2UoKS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLmRpc2Nvbm5lY3RGcm9udGVuZChJ bnNwZWN0b3I6Okluc3BlY3RvckRpc2Nvbm5lY3RSZWFzb246Okluc3BlY3RvckRlc3Ryb3llZCk7 CisKKyAgICBpZiAobV9wYWdlLT5jb3JlUGFnZSgpKQorICAgICAgICBtX3BhZ2UtPmNvcmVQYWdl KCktPmluc3BlY3RvckNvbnRyb2xsZXIoKS5kaXNjb25uZWN0RnJvbnRlbmQoSW5zcGVjdG9yOjpJ bnNwZWN0b3JEaXNjb25uZWN0UmVhc29uOjpJbnNwZWN0b3JEZXN0cm95ZWQpOwogfQogI2VuZGlm CiAK