183018 2018-02-21 14:24:49 -0800 Regression(r228708): Crash under WebCore::MediaResource::responseReceived(WebCore::CachedResource&, WebCore::ResourceResponse const&) 2018-02-21 15:56:23 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 182931 1 cdumez cdumez achristensen aestes beidson commit-queue eric.carlson jer.noble koivisto rniwa webkit-bug-importer oldest_to_newest 1401272 0 cdumez 2018-02-21 14:24:49 -0800 Crash under WebCore::MediaResource::responseReceived(WebCore::CachedResource&, WebCore::ResourceResponse const&): Thread 0 Crashed: 0 libsystem_kernel.dylib 0x0000000180c152ec __pthread_kill + 8 1 libsystem_pthread.dylib 0x0000000180dae0a8 pthread_kill$VARIANT$mp + 384 2 libsystem_c.dylib 0x0000000180b82cf0 abort + 140 3 libc++abi.dylib 0x00000001803182c8 abort_message + 132 (~rc/Software/DTPeace/Projects/libcxxabi/libcxxabi-400.13/src/abort_message.cpp:75) 4 libc++abi.dylib 0x0000000180318470 default_terminate_handler() + 304 (~rc/Software/DTPeace/Projects/libcxxabi/libcxxabi-400.13/src/cxa_default_handlers.cpp:68) 5 libobjc.A.dylib 0x00000001803448e8 _objc_terminate() + 124 (~rc/Software/DTPeace/Projects/objc4/objc4-734.1/runtime/objc-exception.mm:713) 6 libc++abi.dylib 0x000000018033237c std::__terminate(void (*)()) + 16 (~rc/Software/DTPeace/Projects/libcxxabi/libcxxabi-400.13/src/cxa_handlers.cpp:66) 7 libc++abi.dylib 0x0000000180331ccc __cxa_throw + 132 (~rc/Software/DTPeace/Projects/libcxxabi/libcxxabi-400.13/src/cxa_exception.cpp:134) 8 libobjc.A.dylib 0x0000000180344624 objc_exception_throw + 364 (~rc/Software/DTPeace/Projects/objc4/objc4-734.1/runtime/objc-exception.mm:603) 9 CoreFoundation 0x00000001811900e8 -[NSObject(NSObject) doesNotRecognizeSelector:] + 140 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/ObjC.subproj/NSObject.m:322) 10 CoreFoundation 0x0000000181188610 ___forwarding___ + 1380 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/ObjC.subproj/NSForwarding.m:3224) 11 CoreFoundation 0x000000018106e59c _CF_forwarding_prep_0 + 92 12 WebCore 0x00000001054c6030 WebCore::MediaResource::responseReceived(WebCore::CachedResource&, WebCore::ResourceResponse const&) + 468 13 WebCore 0x00000001045c1ecc WebCore::CachedRawResource::responseReceived(WebCore::ResourceResponse const&) + 252 14 WebCore 0x00000001054dd0f4 WebCore::SubresourceLoader::didReceiveResponse(WebCore::ResourceResponse const&, WTF::CompletionHandler<void ()>&&) + 1092 15 WebKit 0x0000000102cc692c WebKit::WebResourceLoader::didReceiveResponse(WebCore::ResourceResponse const&, bool) + 372 16 WebKit 0x0000000102cc7aa8 void IPC::handleMessage<Messages::WebResourceLoader::DidReceiveResponse, WebKit::WebResourceLoader, void (WebKit::WebResourceLoader::*)(WebCore::ResourceResponse const&, bool)>(IPC::Decoder&, WebKit::WebResourceLoader*, void (WebKit::WebResourceLoader::*)(WebCore::ResourceResponse const&, bool)) + 156 17 WebKit 0x0000000102acb0ec WebKit::NetworkProcessConnection::didReceiveMessage(IPC::Connection&, IPC::Decoder&) + 132 18 WebKit 0x0000000102a44228 IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) + 164 19 WebKit 0x0000000102a46c30 IPC::Connection::dispatchOneMessage() + 232 20 JavaScriptCore 0x00000001040f5318 WTF::RunLoop::performWork() + 348 21 JavaScriptCore 0x00000001040f5588 WTF::RunLoop::performWork(void*) + 36 22 CoreFoundation 0x000000018112b4b4 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 24 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/RunLoop.subproj/CFRunLoop.c:1982) 23 CoreFoundation 0x000000018112ad90 __CFRunLoopDoSources0 + 456 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2017) 24 CoreFoundation 0x000000018112884c __CFRunLoopRun + 1204 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/RunLoop.subproj/CFRunLoop.c:2924) 25 CoreFoundation 0x0000000181048ec8 CFRunLoopRunSpecific + 552 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/CoreFoundation/Foundation-1522/CoreFoundation/RunLoop.subproj/CFRunLoop.c:3249) 26 Foundation 0x0000000181ac9ab4 -[NSRunLoop(NSRunLoop) runMode:beforeDate:] + 304 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/Foundation/Foundation-1522/Foundation/Soil.subproj/NSRunLoop.m:367) 27 Foundation 0x0000000181b1b998 -[NSRunLoop(NSRunLoop) run] + 88 (/BuildRoot/Library/Caches/com.apple.xbs/Sources/Foundation/Foundation-1522/Foundation/Soil.subproj/NSRunLoop.m:389) 28 libxpc.dylib 0x0000000180df5ba0 _xpc_objc_main + 516 (~rc/Software/Peace/Projects/libxpc/libxpc-1336.200.10/src/main.m:170) 29 libxpc.dylib 0x0000000180df7c74 xpc_main + 180 (~rc/Software/Peace/Projects/libxpc/libxpc-1336.200.10/src/init.c:1452) 30 com.apple.WebKit.WebContent 0x00000001027475a4 0x102744000 + 13732 31 libdyld.dylib 0x0000000180ae4ea4 start + 4 1401275 1 cdumez 2018-02-21 14:25:30 -0800 <rdar://problem/37754154> 1401286 2 334416 cdumez 2018-02-21 14:36:12 -0800 Created attachment 334416 Patch 1401307 3 334416 commit-queue 2018-02-21 15:56:21 -0800 Comment on attachment 334416 Patch Clearing flags on attachment: 334416 Committed r228903: <https://trac.webkit.org/changeset/228903> 1401308 4 commit-queue 2018-02-21 15:56:23 -0800 All reviewed patches have been landed. Closing bug. 334416 2018-02-21 14:36:12 -0800 2018-02-21 15:56:21 -0800 Patch bug-183018-20180221143611.patch text/plain 7593 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4ODkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhiOWQyOTQ3OWYzN2U2 MDE5Y2UxOTMzMGQ5YjhmYWZiYTZjZGNiOS4uOGEzMWQ0ZTIxMDI2OGZlNDI3Nzg1NWI4NzQ2Y2Ni NzMxMGY4ZDg4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE4LTAyLTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihyMjI4NzA4 KTogQ3Jhc2ggdW5kZXIgV2ViQ29yZTo6TWVkaWFSZXNvdXJjZTo6cmVzcG9uc2VSZWNlaXZlZChX ZWJDb3JlOjpDYWNoZWRSZXNvdXJjZSYsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UgY29uc3Qm KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMDE4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzc1NDE1ND4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZml4IGF0IHIyMjg3MDggd2FzIHRyeWlu ZyB0byBhZGRyZXNzIHRoZSBmYWN0IHRoYXQgYXZwbGF5ZXIgc29tZXRpbWVzCisgICAgICAgIGRl YWxsb2NhdGVzIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBvYmplY3RzIG9uIGEgbm9uLW1h aW4gdGhyZWFkLCB3aGljaAorICAgICAgICB3YXMgbm90IHNhZmUgYmVjYXVzZSBpdHMgX3Jlc291 cmNlIGRhdGEgbWVtYmVyIG5lZWRzIHRvIGJlIGRlYWxsb2NhdGVkIG9uCisgICAgICAgIHRoZSBt YWluIHRocmVhZC4KKworICAgICAgICBUaGUgaXNzdWUgaXMgdGhhdCByMjI4NzA4IGNhdXNlZCBf cmVzb3VyY2UgdG8gb3V0bGl2ZSBpdHMgV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrLgorICAg ICAgICBUaGlzIGlzIGFuIGlzc3VlIGJlY2F1c2UgX3Jlc291cmNlIGhhcyBhIGNsaWVudCBkYXRh IG1lbWJlciAob2YgdHlwZSBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQpCisgICAg ICAgIHdoaWNoIGhhcyBhIHJhdyBwb2ludGVyIHRvIHRoZSBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0 YVRhc2suIFRoaXMgbWVhbnMgdGhhdCB0aGUgbWFpbiB0aHJlYWQgY291bGQKKyAgICAgICAgY2Fs bCBtZXRob2RzIGxpa2UgcmVzcG9uc2VSZWNlaXZlZCgpIG9uIHRoZSByZXNvdXJjZSwgd2hpY2gg d291bGQgY2FsbCByZXNwb25zZVJlY2VpdmVkKCkgb24gdGhlCisgICAgICAgIGNsaWVudCwgd2hp Y2ggd291bGQgdHJ5IHRvIGNhbGwgW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayByZWNlaXZl ZFJlc3BvbnNlOl0gd2l0aCBhbiBpbnZhbGlkCisgICAgICAgIG1fdGFzayBwb2ludGVyLgorCisg ICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCBJIGludHJvZHVjZWQgYSBjbGVhclRhc2soKSBt ZXRob2Qgb24gV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrQ2xpZW50LCB3aGljaAorICAgICAg ICBnZXRzIGNhbGxlZCBmcm9tIGEgbm9uLW1haW4gdGhyZWFkIHRvIGNsZWFyIHRoZSBjbGllbnQn cyBtX3Rhc2sgcG9pbnRlciB3aGVuIHRoZSB0YXNrIGlzIGRlc3Ryb3llZAorICAgICAgICBvbiBh IG5vbi1tYWluIHRocmVhZC4gU28gdGhhdCB0aGlzIGlzIHNhZmUsIGV2ZXJ5IHRpbWUgdGhlIGNs aWVudCB0cmllcyB0byB1c2UgbV90YXNrLCB3ZSBub3cKKyAgICAgICAgYWNxdWlyZSBhIGxvY2sg Zm9yIHRocmVhZC1zYWZldHkgYW5kIGRvIGEgbnVsbC1jaGVjayBvbiBtX3Rhc2suCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBubyBrbm93biByZXByb2R1Y3Rpb24gY2FzZS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtTWVkaWFSZXNvdXJjZUxvYWRlci5oOgorICAgICAg ICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVJlc291cmNlOjpjbGllbnQpOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbToKKyAgICAgICAgKFdl YkNvcmU6OldlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6Y2xlYXJUYXNrKToKKyAg ICAgICAgKFdlYkNvcmU6OldlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6ZGF0YVNl bnQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrQ2xpZW50 OjpyZXNwb25zZVJlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVOU1VSTFNlc3Np b25EYXRhVGFza0NsaWVudDo6c2hvdWxkQ2FjaGVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisgICAg ICAgIChXZWJDb3JlOjpXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OnJlZGlyZWN0 UmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNr Q2xpZW50OjphY2Nlc3NDb250cm9sQ2hlY2tGYWlsZWQpOgorICAgICAgICAoV2ViQ29yZTo6V2Vi Q29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrQ2xpZW50Ojpsb2FkRmFpbGVkKToKKyAgICAgICAgKFdl YkNvcmU6OldlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6bG9hZEZpbmlzaGVkKToK KyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIGRlYWxsb2NdKToKKwogMjAx OC0wMi0yMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNl IFJlc291cmNlTG9hZGVyIHRvIGxvYWQgYXBwY2FjaGUgbWFuaWZlc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtTWVkaWFSZXNvdXJjZUxvYWRl ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGxhdGZvcm1NZWRpYVJlc291 cmNlTG9hZGVyLmgKaW5kZXggODIzZjNjYWZlNDU4YmQzZGNlYmNiN2VkNDg4NGVmMTJlZjBkZjg4 ZC4uMzczOTZkMjlkNzBlNWU3ZjBhYzBmOWU5ZDY4OTcwZWRiOWYyMGQxOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGxhdGZvcm1NZWRpYVJlc291cmNlTG9h ZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGxhdGZvcm1NZWRp YVJlc291cmNlTG9hZGVyLmgKQEAgLTgwLDYgKzgwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg Ym9vbCBkaWRQYXNzQWNjZXNzQ29udHJvbENoZWNrKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0K IAogICAgIHZvaWQgc2V0Q2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybU1lZGlhUmVzb3Vy Y2VDbGllbnQ+JiYgY2xpZW50KSB7IG1fY2xpZW50ID0gV1RGTW92ZShjbGllbnQpOyB9CisgICAg UGxhdGZvcm1NZWRpYVJlc291cmNlQ2xpZW50KiBjbGllbnQoKSB7IHJldHVybiBtX2NsaWVudC5n ZXQoKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtTWVkaWFS ZXNvdXJjZUNsaWVudD4gbV9jbGllbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0KaW5kZXggMDUx MTY0MzQ4NGY0OThiOTczNWNkNTc4NDE4MzBjZTRiODU5MDQ0OS4uMzdjYmIzMjQ5ZTM0NDM2MGMx NzdjNjVhZjQ1NzE0ZTM2NThkYzMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQpAQCAtMzU0 LDYgKzM1NCw4IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCisgICAgdm9pZCBjbGVhclRhc2so KTsKKwogICAgIHZvaWQgcmVzcG9uc2VSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJikgb3ZlcnJpZGU7CiAgICAgdm9pZCByZWRpcmVjdFJlY2Vp dmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIFJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZXNvdXJjZVJlcXVlc3QmJik+ JiYpIG92ZXJyaWRlOwogICAgIGJvb2wgc2hvdWxkQ2FjaGVSZXNwb25zZShQbGF0Zm9ybU1lZGlh UmVzb3VyY2UmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJikgb3ZlcnJpZGU7CkBAIC0zNjQsMzEg KzM2Niw1OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBsb2FkRmluaXNoZWQoUGxhdGZvcm1NZWRpYVJl c291cmNlJikgb3ZlcnJpZGU7CiAKIHByaXZhdGU6CisgICAgTG9jayBtX3Rhc2tMb2NrOwogICAg IFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqbV90YXNrOwogfTsKIAordm9pZCBXZWJDb3Jl TlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmNsZWFyVGFzaygpCit7CisgICAgTG9ja0hvbGRl ciBsb2NrZXIobV90YXNrTG9jayk7CisgICAgbV90YXNrID0gbnVsbHB0cjsKK30KKwogdm9pZCBX ZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmRhdGFTZW50KFBsYXRmb3JtTWVkaWFS ZXNvdXJjZSYgcmVzb3VyY2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1NlbnQsIHVuc2lnbmVk IGxvbmcgbG9uZyB0b3RhbEJ5dGVzVG9CZVNlbnQpCiB7CisgICAgTG9ja0hvbGRlciBsb2NrZXIo bV90YXNrTG9jayk7CisgICAgaWYgKCFtX3Rhc2spCisgICAgICAgIHJldHVybjsKKwogICAgIFtt X3Rhc2sgcmVzb3VyY2U6cmVzb3VyY2Ugc2VudEJ5dGVzOmJ5dGVzU2VudCB0b3RhbEJ5dGVzVG9C ZVNlbnQ6dG90YWxCeXRlc1RvQmVTZW50XTsKIH0KIAogdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9u RGF0YVRhc2tDbGllbnQ6OnJlc3BvbnNlUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiBy ZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CisgICAgTG9ja0hv bGRlciBsb2NrZXIobV90YXNrTG9jayk7CisgICAgaWYgKCFtX3Rhc2spCisgICAgICAgIHJldHVy bjsKKwogICAgIFttX3Rhc2sgcmVzb3VyY2U6cmVzb3VyY2UgcmVjZWl2ZWRSZXNwb25zZTpyZXNw b25zZV07CiB9CiAKIGJvb2wgV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrQ2xpZW50OjpzaG91 bGRDYWNoZVJlc3BvbnNlKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYgcmVzb3VyY2UsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogeworICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fdGFz a0xvY2spOworICAgIGlmICghbV90YXNrKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBy ZXR1cm4gW21fdGFzayByZXNvdXJjZTpyZXNvdXJjZSBzaG91bGRDYWNoZVJlc3BvbnNlOnJlc3Bv bnNlXTsKIH0KIAogdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmRhdGFS ZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmIHJlc291cmNlLCBjb25zdCBjaGFyKiBkYXRh LCBpbnQgbGVuZ3RoKQogeworICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fdGFza0xvY2spOworICAg IGlmICghbV90YXNrKQorICAgICAgICByZXR1cm47CisKICAgICBbbV90YXNrIHJlc291cmNlOnJl c291cmNlIHJlY2VpdmVkRGF0YTpkYXRhIGxlbmd0aDpsZW5ndGhdOwogfQogCiB2b2lkIFdlYkNv cmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVudDo6cmVkaXJlY3RSZWNlaXZlZChQbGF0Zm9ybU1l ZGlhUmVzb3VyY2UmIHJlc291cmNlLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZXNvdXJj ZVJlcXVlc3QmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgTG9ja0hvbGRlciBsb2Nr ZXIobV90YXNrTG9jayk7CisgICAgaWYgKCFtX3Rhc2spCisgICAgICAgIHJldHVybjsKKwogICAg IFttX3Rhc2sgcmVzb3VyY2U6cmVzb3VyY2UgcmVjZWl2ZWRSZWRpcmVjdDpyZXNwb25zZSByZXF1 ZXN0OldURk1vdmUocmVxdWVzdCkgY29tcGxldGlvbkhhbmRsZXI6IFtjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoYXV0byYmIHJlcXVlc3QpIHsKICAgICAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShyZXF1ZXN0KSk7CkBAIC0zOTcsMTYgKzQyNiwyOCBAQCB2b2lkIFdlYkNvcmVOU1VSTFNl c3Npb25EYXRhVGFza0NsaWVudDo6cmVkaXJlY3RSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3Vy Y2UmCiAKIHZvaWQgV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrQ2xpZW50OjphY2Nlc3NDb250 cm9sQ2hlY2tGYWlsZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiByZXNvdXJjZSwgY29uc3QgUmVz b3VyY2VFcnJvciYgZXJyb3IpCiB7CisgICAgTG9ja0hvbGRlciBsb2NrZXIobV90YXNrTG9jayk7 CisgICAgaWYgKCFtX3Rhc2spCisgICAgICAgIHJldHVybjsKKwogICAgIFttX3Rhc2sgcmVzb3Vy Y2U6cmVzb3VyY2UgYWNjZXNzQ29udHJvbENoZWNrRmFpbGVkV2l0aEVycm9yOmVycm9yXTsKIH0K IAogdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRGYWlsZWQoUGxh dGZvcm1NZWRpYVJlc291cmNlJiByZXNvdXJjZSwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3Ip CiB7CisgICAgTG9ja0hvbGRlciBsb2NrZXIobV90YXNrTG9jayk7CisgICAgaWYgKCFtX3Rhc2sp CisgICAgICAgIHJldHVybjsKKwogICAgIFttX3Rhc2sgcmVzb3VyY2U6cmVzb3VyY2UgbG9hZEZh aWxlZFdpdGhFcnJvcjplcnJvcl07CiB9CiAKIHZvaWQgV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFU YXNrQ2xpZW50Ojpsb2FkRmluaXNoZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiByZXNvdXJjZSkK IHsKKyAgICBMb2NrSG9sZGVyIGxvY2tlcihtX3Rhc2tMb2NrKTsKKyAgICBpZiAoIW1fdGFzaykK KyAgICAgICAgcmV0dXJuOworCiAgICAgW21fdGFzayByZXNvdXJjZUZpbmlzaGVkOnJlc291cmNl XTsKIH0KIApAQCAtNTM5LDcgKzU4MCwxMyBAQCAtICh2b2lkKWRlYWxsb2MKICAgICBbX2N1cnJl bnRSZXF1ZXN0IHJlbGVhc2VdOwogICAgIFtfZXJyb3IgcmVsZWFzZV07CiAgICAgW190YXNrRGVz Y3JpcHRpb24gcmVsZWFzZV07Ci0gICAgY2FsbE9uTWFpblRocmVhZChbcmVzb3VyY2UgPSBXVEZN b3ZlKF9yZXNvdXJjZSldIHsgfSk7CisKKyAgICBpZiAoIWlzTWFpblRocmVhZCgpICYmIF9yZXNv dXJjZSkgeworICAgICAgICBpZiAoYXV0byogY2xpZW50ID0gX3Jlc291cmNlLT5jbGllbnQoKSkK KyAgICAgICAgICAgIHN0YXRpY19jYXN0PFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFza0NsaWVu dCo+KGNsaWVudCktPmNsZWFyVGFzaygpOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtyZXNv dXJjZSA9IFdURk1vdmUoX3Jlc291cmNlKV0geyB9KTsKKyAgICB9CisKICAgICBbc3VwZXIgZGVh bGxvY107CiB9CiAK