127738 2014-01-27 17:20:26 -0800 Web Inspector: CRASH when debugger closes remote inspecting JSContext 2014-01-27 20:51:25 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 972685 0 joepeck 2014-01-27 17:20:26 -0800 * SUMMARY JSContext hosting application crashes when a remote debugger disconnects during inspection. * STEPS TO REPRODUCE 1. Launch JSContextTester application 2. Inspect JSContext from remote debugger 3. Close remote debugger => CRASH * NOTES It looks like RemoteInspectorXPCConnection may be handling an event on a background dispatch_queue at the same time that the main queue releases the RemoteInspectorXPCConnection. The dispatch_queue is passed a "weakThis" pointer, which is wrong. * CRASH void RemoteInspectorXPCConnection::handleEvent(xpc_object_t object) { if (!m_connection) return; if (xpc_get_type(object) == XPC_TYPE_ERROR) { if (m_client) m_client->xpcConnectionFailed(this); // <-- CRASH EXC_BAD_ACCESS return; } ... } (lldb) bt * thread #4: tid = 0x1292ba, 0x00000001003a11ab JavaScriptCore`Inspector::RemoteInspectorXPCConnection::handleEvent(this=0x00000001099333e0, object=<unavailable>) + 155 at RemoteInspectorXPCConnection.mm:112, queue = 'com.apple.JavaScriptCore.remote-inspector-xpc-connection, stop reason = EXC_BAD_ACCESS (code=EXC_I386_GPFLT) frame #0: 0x00000001003a11ab JavaScriptCore`Inspector::RemoteInspectorXPCConnection::handleEvent(this=0x00000001099333e0, object=<unavailable>) + 155 at RemoteInspectorXPCConnection.mm:112 frame #1: 0x00007fff8bb645cc libxpc.dylib`_xpc_connection_call_event_handler + 58 frame #2: 0x00007fff8bb62dcb libxpc.dylib`_xpc_connection_mach_event + 1080 frame #3: 0x00007fff8d745afe libdispatch.dylib`_dispatch_client_callout4 + 9 frame #4: 0x00007fff8d74865c libdispatch.dylib`_dispatch_mach_cancel_invoke + 50 frame #5: 0x00007fff8d745860 libdispatch.dylib`_dispatch_mach_invoke + 604 frame #6: 0x00007fff8d744633 libdispatch.dylib`_dispatch_queue_drain + 359 frame #7: 0x00007fff8d7459dd libdispatch.dylib`_dispatch_queue_invoke + 110 frame #8: 0x00007fff8d743fa3 libdispatch.dylib`_dispatch_root_queue_drain + 75 frame #9: 0x00007fff8d745193 libdispatch.dylib`_dispatch_worker_thread2 + 40 frame #10: 0x00007fff8f33cef8 libsystem_pthread.dylib`_pthread_wqthread + 314 frame #11: 0x00007fff8f33ffb9 libsystem_pthread.dylib`start_wqthread + 13 972687 1 joepeck 2014-01-27 17:21:43 -0800 I'm going to look into changing RemoteInspectorXPCConnection from OwnPtr to a ThreadSafeRefPtr. In the old iOS inspector this used to be a retained NSObject in the block, where the "weakThis" is now not keeping the object alive. 972691 2 webkit-bug-importer 2014-01-27 17:24:34 -0800 <rdar://problem/15921226> 972747 3 222397 joepeck 2014-01-27 19:44:33 -0800 Created attachment 222397 [PATCH] Proposed Fix 972768 4 222397 commit-queue 2014-01-27 20:51:23 -0800 Comment on attachment 222397 [PATCH] Proposed Fix Clearing flags on attachment: 222397 Committed r162910: <http://trac.webkit.org/changeset/162910> 972769 5 commit-queue 2014-01-27 20:51:25 -0800 All reviewed patches have been landed. Closing bug. 222397 2014-01-27 19:44:33 -0800 2014-01-27 20:51:23 -0800 [PATCH] Proposed Fix threading.patch text/plain 8011 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGFiZDcwZWEuLjFkNmI0NWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ1IEBACiAyMDE0LTAxLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ1JBU0gg d2hlbiBkZWJ1Z2dlciBjbG9zZXMgcmVtb3RlIGluc3BlY3RpbmcgSlNDb250ZXh0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc3MzgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdGVJbnNwZWN0b3JY UENDb25uZWN0aW9uIGNvdWxkIGJlIGFjY2Vzc2VkIGluIGEgYmFja2dyb3VuZCBkaXNwYXRjaAor ICAgICAgICBxdWV1ZSwgd2hpbGUgYmVpbmcgZGVhbGxvY2F0ZWQgb24gdGhlIG1haW4gdGhyZWFk IHdoZW4gYSBjb25uZWN0aW9uCisgICAgICAgIHdhcyBzdWRkZW5seSB0ZXJtaW5hdGVkLgorCisg ICAgICAgIE1ha2UgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbiBhIFRocmVhZFNhZmVSZWZD b3VudGVkIG9iamVjdC4gQWx3YXlzCisgICAgICAgIGtlZXAgdGhlIGNvbm5lY3Rpb24gb2JqZWN0 IHJlZidkIHVudGlsIHRoZSBtYWluIHRocmVhZCBjYWxscyBjbG9zZSgpCisgICAgICAgIGFuZCBy ZW1vdmVzIGl0cyByZWZlcmVuY2UuIEF0IHRoYXQgcG9pbnQgd2UgY2FuIGNsb3NlIHRoZSBjb25u ZWN0aW9uLAorICAgICAgICBxdWV1ZSwgYW5kIGRlcmVmIHNhZmVseSBvbiB0aGUgYmFja2dyb3Vu ZCBxdWV1ZS4KKworICAgICAgICAqIGluc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmg6 CisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3IubW06CisgICAgICAg IChJbnNwZWN0b3I6OlJlbW90ZUluc3BlY3Rvcjo6c2V0dXBYUENDb25uZWN0aW9uSWZOZWVkZWQp OgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3I6OnhwY0Nvbm5lY3Rpb25GYWls ZWQpOgorICAgICAgICBGb3Igc2ltcGxpY2l0eSBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9u cydzIGRvbid0IGhhdmUgYW55IHRocmVhZGluZworICAgICAgICBwcmltYXRpdmVzIHRvIHByZXZl bnQgY2xpZW50IGNhbGxiYWNrcyBhZnRlciB0aGV5IGFyZSBjbG9zZWQuIFJlbW90ZUluc3BlY3Rv cgorICAgICAgICBkb2VzLCBzbyBpdCBqdXN0IGlnbm9yZXMgcG9zc2libGUgY2FsbGJhY2tzIGZy b20gY29ubmVjdGlvbnMgaXQgbm8gbG9uZ2VyCisgICAgICAgIGNhcmVzIGFib3V0LgorCisgICAg ICAgICogaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmg6Cisg ICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1t OgorICAgICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpSZW1v dGVJbnNwZWN0b3JYUENDb25uZWN0aW9uKToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5z cGVjdG9yWFBDQ29ubmVjdGlvbjo6flJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24pOgorICAg ICAgICAoSW5zcGVjdG9yOjpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpjbG9zZSk6Cisg ICAgICAgIEtlZXAgdGhlIGNvbm5lY3Rpb24gYWxpdmUgYXMgbG9uZyBhcyB0aGUgcXVldWUgaXQg Y2FuIGJlIHVzZWQgb24KKyAgICAgICAgaXMgYWxpdmUuIENsZWFuIHVwIGV2ZXJ5dGhpbmcgb24g dGhlIHF1ZXVlIHdoZW4gY2xvc2UoKSBpcyBjYWxsZWQuCisKKyAgICAgICAgKEluc3BlY3Rvcjo6 UmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6aGFuZGxlRXZlbnQpOgorICAgICAgICBDaGVj a2luZyBpZiBjbG9zZWQgaGVyZSBpcyBub3QgdGhyZWFkIHNhZmUgc28gaXQgaXMgbWVhbmluZ2xl c3MuCisgICAgICAgIFJlbW92ZSB0aGUgY2hlY2suCisKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVt b3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UpOgorICAgICAgICBCYWlsIGJh c2VkIG9uIHRoZSBtX2Nsb3NlZCBzdGF0ZS4KKworMjAxNC0wMS0yNyAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIC1bSlNDb250ZXh0IGV2YWx1dGVTY3Jp cHQ6XSBjYWxscyBKU0V2YWx1dGVTY3JpcHQgd2l0aCBzdGFydGluZ0xpbmVOdW1iZXIgMCwgbGF0 ZXIgaW50ZXJwcmV0ZWQgYXMgYSBvbmVCYXNlZEludAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NjQ4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rvci5oIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKaW5kZXggNTVi MmY5OS4uYmFhZGI0NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu c3BlY3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLmgKQEAgLTk0LDcgKzk0LDcgQEAgcHJpdmF0 ZToKIAogICAgIEhhc2hNYXA8dW5zaWduZWQsIHN0ZDo6cGFpcjxSZW1vdGVJbnNwZWN0b3JEZWJ1 Z2dhYmxlKiwgUmVtb3RlSW5zcGVjdG9yRGVidWdnYWJsZUluZm8+PiBtX2RlYnVnZ2FibGVNYXA7 CiAgICAgSGFzaE1hcDx1bnNpZ25lZCwgUmVmUHRyPFJlbW90ZUluc3BlY3RvckRlYnVnZ2FibGVD b25uZWN0aW9uPj4gbV9jb25uZWN0aW9uTWFwOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW1vdGVJ bnNwZWN0b3JYUENDb25uZWN0aW9uPiBtX3hwY0Nvbm5lY3Rpb247CisgICAgUmVmUHRyPFJlbW90 ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24+IG1feHBjQ29ubmVjdGlvbjsKICAgICB1bnNpZ25lZCBt X25leHRBdmFpbGFibGVJZGVudGlmaWVyOwogICAgIGludCBtX25vdGlmeVRva2VuOwogICAgIGJv b2wgbV9lbmFibGVkOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yLm1tCmluZGV4IDljMzM3YWMuLjY4MzFlZmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUlu c3BlY3Rvci5tbQorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9S ZW1vdGVJbnNwZWN0b3IubW0KQEAgLTIxNSw3ICsyMTUsNyBAQCB2b2lkIFJlbW90ZUluc3BlY3Rv cjo6c2V0dXBYUENDb25uZWN0aW9uSWZOZWVkZWQoKQogICAgIGlmICghY29ubmVjdGlvbikKICAg ICAgICAgcmV0dXJuOwogCi0gICAgbV94cGNDb25uZWN0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxS ZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uPihjb25uZWN0aW9uLCB0aGlzKTsKKyAgICBtX3hw Y0Nvbm5lY3Rpb24gPSBhZG9wdFJlZihuZXcgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbihj b25uZWN0aW9uLCB0aGlzKSk7CiAgICAgbV94cGNDb25uZWN0aW9uLT5zZW5kTWVzc2FnZShAInN5 biIsIG5pbCk7IC8vIFNlbmQgYSBzaW1wbGUgbWVzc2FnZSB0byBpbml0aWFsaXplIHRoZSBYUEMg Y29ubmVjdGlvbi4KICAgICB4cGNfcmVsZWFzZShjb25uZWN0aW9uKTsKIApAQCAtMjQ5LDkgKzI0 OSwxMSBAQCB2b2lkIFJlbW90ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlvblJlY2VpdmVkTWVzc2Fn ZShSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uKgogICAgICAgICBOU0xvZyhAIlVucmVjb2du aXplZCBSZW1vdGVJbnNwZWN0b3IgWFBDIE1lc3NhZ2U6ICVAIiwgbWVzc2FnZU5hbWUpOwogfQog Ci12b2lkIFJlbW90ZUluc3BlY3Rvcjo6eHBjQ29ubmVjdGlvbkZhaWxlZChSZW1vdGVJbnNwZWN0 b3JYUENDb25uZWN0aW9uKikKK3ZvaWQgUmVtb3RlSW5zcGVjdG9yOjp4cGNDb25uZWN0aW9uRmFp bGVkKFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24pCiB7CiAgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fbG9jayk7CisgICAgaWYgKGNvbm5lY3Rpb24gIT0gbV94cGNDb25u ZWN0aW9uKQorICAgICAgICByZXR1cm47CiAKICAgICBtX3B1c2hTY2hlZHVsZWQgPSBmYWxzZTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvUmVt b3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9yZW1vdGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5oCmluZGV4IGI2YjM4YzQu LjMzZTVjMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLmgKQEAg LTI5LDcgKzI5LDcgQEAKICNkZWZpbmUgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbl9oCiAK ICNpbXBvcnQgPGRpc3BhdGNoL2Rpc3BhdGNoLmg+Ci0jaW1wb3J0IDx3dGYvTm9uY29weWFibGUu aD4KKyNpbXBvcnQgPHd0Zi9UaHJlYWRTYWZlUmVmQ291bnRlZC5oPgogI2ltcG9ydCA8eHBjL3hw Yy5oPgogCiBPQkpDX0NMQVNTIE5TRGljdGlvbmFyeTsKQEAgLTM3LDkgKzM3LDcgQEAgT0JKQ19D TEFTUyBOU1N0cmluZzsKIAogbmFtZXNwYWNlIEluc3BlY3RvciB7CiAKLWNsYXNzIFJlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb24gewotICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlbW90ZUlu c3BlY3RvclhQQ0Nvbm5lY3Rpb24pOwotCitjbGFzcyBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0 aW9uIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5l Y3Rpb24+IHsKIHB1YmxpYzoKICAgICBjbGFzcyBDbGllbnQgewogICAgIHB1YmxpYzoKQEAgLTYy LDYgKzYwLDcgQEAgcHJpdmF0ZToKICAgICB4cGNfY29ubmVjdGlvbl90IG1fY29ubmVjdGlvbjsK ICAgICBkaXNwYXRjaF9xdWV1ZV90IG1fcXVldWU7CiAgICAgQ2xpZW50KiBtX2NsaWVudDsKKyAg ICBib29sIG1fY2xvc2VkOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVJbnNwZWN0 b3JYUENDb25uZWN0aW9uLm1tIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1v dGUvUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbi5tbQppbmRleCBhZDE2OTk4Li42NzRhYjlj IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9SZW1v dGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24ubW0KQEAgLTQ5LDEz ICs0OSwxNyBAQCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpSZW1vdGVJbnNwZWN0b3JY UENDb25uZWN0aW9uKHhwY19jb25uZWN0aW9uX3QgY29ubgogICAgIDogbV9jb25uZWN0aW9uKGNv bm5lY3Rpb24pCiAgICAgLCBtX3F1ZXVlKGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29tLmFwcGxl LkphdmFTY3JpcHRDb3JlLnJlbW90ZS1pbnNwZWN0b3IteHBjLWNvbm5lY3Rpb24iLCBESVNQQVRD SF9RVUVVRV9TRVJJQUwpKQogICAgICwgbV9jbGllbnQoY2xpZW50KQorICAgICwgbV9jbG9zZWQo ZmFsc2UpCiB7CiAgICAgeHBjX3JldGFpbihtX2Nvbm5lY3Rpb24pOwogICAgIHhwY19jb25uZWN0 aW9uX3NldF90YXJnZXRfcXVldWUobV9jb25uZWN0aW9uLCBtX3F1ZXVlKTsKLSAgICBSZW1vdGVJ bnNwZWN0b3JYUENDb25uZWN0aW9uKiB3ZWFrVGhpcyA9IHRoaXM7CiAgICAgeHBjX2Nvbm5lY3Rp b25fc2V0X2V2ZW50X2hhbmRsZXIobV9jb25uZWN0aW9uLCBeKHhwY19vYmplY3RfdCBvYmplY3Qp IHsKLSAgICAgICAgd2Vha1RoaXMtPmhhbmRsZUV2ZW50KG9iamVjdCk7CisgICAgICAgIGhhbmRs ZUV2ZW50KG9iamVjdCk7CiAgICAgfSk7CisKKyAgICAvLyBCYWxhbmNlZCBieSBkZXJlZiBpbiBj bG9zZS4KKyAgICByZWYoKTsKKwogICAgIHhwY19jb25uZWN0aW9uX3Jlc3VtZShtX2Nvbm5lY3Rp b24pOwogfQogCkBAIC02MywyMSArNjcsMjkgQEAgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlv bjo6flJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb24oKQogewogICAgIEFTU0VSVCghbV9jbGll bnQpOwogICAgIEFTU0VSVCghbV9jb25uZWN0aW9uKTsKKyAgICBBU1NFUlQobV9jbG9zZWQpOwog fQogCiB2b2lkIFJlbW90ZUluc3BlY3RvclhQQ0Nvbm5lY3Rpb246OmNsb3NlKCkKIHsKLSAgICBp ZiAoIW1fY29ubmVjdGlvbikKKyAgICBpZiAobV9jbG9zZWQpCiAgICAgICAgIHJldHVybjsKIAot ICAgIHhwY19jb25uZWN0aW9uX2NhbmNlbChtX2Nvbm5lY3Rpb24pOwotICAgIHhwY19yZWxlYXNl KG1fY29ubmVjdGlvbik7Ci0gICAgbV9jb25uZWN0aW9uID0gTlVMTDsKKyAgICBtX2Nsb3NlZCA9 IHRydWU7CiAKLSAgICBkaXNwYXRjaF9yZWxlYXNlKG1fcXVldWUpOwotICAgIG1fcXVldWUgPSBO VUxMOworICAgIGRpc3BhdGNoX2FzeW5jKG1fcXVldWUsIF57CisgICAgICAgIHhwY19jb25uZWN0 aW9uX2NhbmNlbChtX2Nvbm5lY3Rpb24pOworICAgICAgICB4cGNfcmVsZWFzZShtX2Nvbm5lY3Rp b24pOworICAgICAgICBtX2Nvbm5lY3Rpb24gPSBOVUxMOwogCi0gICAgbV9jbGllbnQgPSBudWxs cHRyOworICAgICAgICBkaXNwYXRjaF9yZWxlYXNlKG1fcXVldWUpOworICAgICAgICBtX3F1ZXVl ID0gTlVMTDsKKworICAgICAgICBtX2NsaWVudCA9IG51bGxwdHI7CisKKyAgICAgICAgLy8gQmFs YW5jZSB0aGUgcmVmIGluIG91ciBjb25zdHJ1Y3Rvci4KKyAgICAgICAgZGVyZWYoKTsKKyAgICB9 KTsKIH0KIAogTlNEaWN0aW9uYXJ5ICpSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpkZXNl cmlhbGl6ZU1lc3NhZ2UoeHBjX29iamVjdF90IG9iamVjdCkKQEAgLTk5LDkgKzExMSw2IEBAIE5T RGljdGlvbmFyeSAqUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6ZGVzZXJpYWxpemVNZXNz YWdlKHhwY19vYmplY3RfdCBvYmplCiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlv bjo6aGFuZGxlRXZlbnQoeHBjX29iamVjdF90IG9iamVjdCkKIHsKLSAgICBpZiAoIW1fY29ubmVj dGlvbikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKHhwY19nZXRfdHlwZShvYmplY3QpID09 IFhQQ19UWVBFX0VSUk9SKSB7CiAgICAgICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgICAgIG1f Y2xpZW50LT54cGNDb25uZWN0aW9uRmFpbGVkKHRoaXMpOwpAQCAtMTIwLDcgKzEyOSw3IEBAIHZv aWQgUmVtb3RlSW5zcGVjdG9yWFBDQ29ubmVjdGlvbjo6aGFuZGxlRXZlbnQoeHBjX29iamVjdF90 IG9iamVjdCkKIAogdm9pZCBSZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uOjpzZW5kTWVzc2Fn ZShOU1N0cmluZyAqbWVzc2FnZU5hbWUsIE5TRGljdGlvbmFyeSAqdXNlckluZm8pCiB7Ci0gICAg aWYgKCFtX2Nvbm5lY3Rpb24pCisgICAgaWYgKG1fY2xvc2VkKQogICAgICAgICByZXR1cm47CiAK ICAgICBOU011dGFibGVEaWN0aW9uYXJ5ICpkaWN0aW9uYXJ5ID0gW05TTXV0YWJsZURpY3Rpb25h cnkgZGljdGlvbmFyeVdpdGhPYmplY3Q6bWVzc2FnZU5hbWUgZm9yS2V5OlJlbW90ZUluc3BlY3Rv clhQQ0Nvbm5lY3Rpb25NZXNzYWdlTmFtZUtleV07Cg==