139260 2014-12-04 10:51:51 -0800 REGRESSION (r173468): Cannot step in WebInspector 2014-12-04 14:47:59 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned ap commit-queue joepeck mark.lam oldest_to_newest 1052506 0 koivisto 2014-12-04 10:51:51 -0800 1 com.apple.JavaScriptCore 0x10e31846e WTFCrash + 0x3e > 2 com.apple.WebCore 0x10e8c9de6 WebCore::DocumentWriter::addData(char const*, unsigned long) + 0x36 3 com.apple.WebCore 0x10e8347f8 WebCore::DocumentLoader::commitData(char const*, unsigned long) + 0x38 4 com.apple.WebKit 0x10d99a1fd WebKit::WebFrameLoaderClient::committedLoad(WebCore::DocumentLoader*, char const*, int) + 0x41 5 com.apple.WebCore 0x10e8d908f WebCore::DocumentLoader::commitLoad(char const*, int) + 0x8f 6 com.apple.WebCore 0x10e8d8c7d WebCore::DocumentLoader::dataReceived(WebCore::CachedResource*, char const*, int) + 0x19d 7 com.apple.WebCore 0x10e8d8901 WebCore::CachedRawResource::notifyClientsDataWasReceived(char const*, unsigned int) + 0xb1 8 com.apple.WebCore 0x10e8d84da WebCore::CachedRawResource::addDataBuffer(WebCore::ResourceBuffer*) + 0xaa 9 com.apple.WebCore 0x10e8d8172 WebCore::SubresourceLoader::didReceiveDataOrBuffer(char const*, int, WTF::PassRefPtr<WebCore::SharedBuffer>, long long, WebCore::DataPayloadType) + 0xd2 10 com.apple.WebCore 0x10f53df03 WebCore::SubresourceLoader::didReceiveData(char const*, unsigned int, long long, WebCore::DataPayloadType) + 0x23 11 com.apple.WebKit 0x10db7118e WebKit::WebResourceLoader::didReceiveWebResourceLoaderMessage(IPC::Connection*, IPC::MessageDecoder&) + 0x226 12 com.apple.WebKit 0x10da1e024 IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::MessageDecoder, std::__1::default_delete<IPC::MessageDecoder> >) + 0x5e 13 com.apple.WebKit 0x10da2019c IPC::Connection::dispatchOneMessage() + 0x72 14 com.apple.JavaScriptCore 0x10e633b67 WTF::RunLoop::performWork() + 0x1a7 15 com.apple.JavaScriptCore 0x10e634232 WTF::RunLoop::performWork(void*) + 0x22 16 com.apple.CoreFoundation 0x7fff8fc57461 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 0x11 17 com.apple.CoreFoundation 0x7fff8fc495ed __CFRunLoopDoSources0 + 0x10d 18 com.apple.CoreFoundation 0x7fff8fc48c1f __CFRunLoopRun + 0x39f 19 com.apple.CoreFoundation 0x7fff8fc48638 CFRunLoopRunSpecific + 0x128 20 com.apple.HIToolbox 0x7fff8a44c7ff RunCurrentEventLoopInMode + 0xeb 21 com.apple.HIToolbox 0x7fff8a44c47e ReceiveNextEventCommon + 0xb3 22 com.apple.HIToolbox 0x7fff8a44c3bb _BlockUntilNextEventMatchingListInModeWithFilter + 0x47 23 com.apple.AppKit 0x7fff88b182d1 _DPSNextEvent + 0x3c4 24 com.apple.AppKit 0x7fff88b17a80 -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 0xc2 25 com.apple.WebCore 0x10ed8ffba WebCore::EventLoop::cycle() + 0x6a 26 com.apple.WebCore 0x10f3d0768 WebCore::PageScriptDebugServer::runEventLoopWhilePaused() + 0x38 27 com.apple.JavaScriptCore 0x10e5ef4fb Inspector::ScriptDebugServer::handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) + 0xfb 28 com.apple.JavaScriptCore 0x10e37e169 JSC::Debugger::pauseIfNeeded(JSC::ExecState*) + 0x149 29 com.apple.JavaScriptCore 0x10e37e4b2 JSC::Debugger::atStatement(JSC::ExecState*) + 0x42 30 com.apple.JavaScriptCore 0x10e32a585 llint_slow_path_debug + 0x45 31 com.apple.JavaScriptCore 0x10e57c1ad llint_entry + 0x5cb5 32 com.apple.JavaScriptCore 0x10e5762e8 vmEntryToJavaScript + 0x146 33 com.apple.JavaScriptCore 0x10e4e9379 JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 0xa9 34 com.apple.JavaScriptCore 0x10e16853d JSC::Interpreter::execute(JSC::ProgramExecutable*, JSC::ExecState*, JSC::JSObject*) + 0x22ed 35 com.apple.JavaScriptCore 0x10e166154 JSC::evaluate(JSC::ExecState*, JSC::SourceCode const&, JSC::JSValue, JSC::JSValue*) + 0x1e4 36 com.apple.WebCore 0x10f4974f9 WebCore::ScriptController::evaluateInWorld(WebCore::ScriptSourceCode const&, WebCore::DOMWrapperWorld&) + 0x139 37 com.apple.WebCore 0x10e8e23d9 WebCore::ScriptController::evaluate(WebCore::ScriptSourceCode const&) + 0x29 38 com.apple.WebCore 0x10e8e227a WebCore::ScriptElement::executeScript(WebCore::ScriptSourceCode const&) + 0x12a 39 com.apple.WebCore 0x10e8e17a2 WebCore::ScriptElement::prepareScript(WTF::TextPosition const&, WebCore::ScriptElement::LegacyTypeSupport) + 0x3b2 40 com.apple.WebCore 0x10e8e0865 WebCore::HTMLScriptRunner::runScript(WebCore::Element*, WTF::TextPosition const&) + 0x165 41 com.apple.WebCore 0x10e8e0690 WebCore::HTMLScriptRunner::execute(WTF::PassRefPtr<WebCore::Element>, WTF::TextPosition const&) + 0x30 42 com.apple.WebCore 0x10e8e05e4 WebCore::HTMLDocumentParser::runScriptsForPausedTreeBuilder() + 0x54 43 com.apple.WebCore 0x10e842c5d WebCore::HTMLDocumentParser::canTakeNextToken(WebCore::HTMLDocumentParser::SynchronousMode, WebCore::PumpSession&) + 0x5d 44 com.apple.WebCore 0x10e841d6e WebCore::HTMLDocumentParser::pumpTokenizer(WebCore::HTMLDocumentParser::SynchronousMode) + 0x1de 45 com.apple.WebCore 0x10e8dbffd WebCore::HTMLDocumentParser::append(WTF::PassRefPtr<WTF::StringImpl>) + 0x1cd 46 com.apple.WebCore 0x10ecb63cc WebCore::DecodedDataDocumentParser::flush(WebCore::DocumentWriter&) + 0x5c 47 com.apple.WebCore 0x10e84093a WebCore::DocumentWriter::end() + 0x2a 48 com.apple.WebCore 0x10e831c25 WebCore::DocumentLoader::finishedLoading(double) + 0x1d5 49 com.apple.WebCore 0x10e8f9bfa WebCore::CachedResource::checkNotify() + 0xaa 50 com.apple.WebCore 0x10e8f9aa6 WebCore::CachedRawResource::finishLoading(WebCore::ResourceBuffer*) + 0xe6 51 com.apple.WebCore 0x10e8f992c WebCore::SubresourceLoader::didFinishLoading(double) + 0x5c 52 com.apple.WebKit 0x10db711f4 WebKit::WebResourceLoader::didReceiveWebResourceLoaderMessage(IPC::Connection*, IPC::MessageDecoder&) + 0x28c 53 com.apple.WebKit 0x10da1e024 IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::MessageDecoder, std::__1::default_delete<IPC::MessageDecoder> >) + 0x5e 54 com.apple.WebKit 0x10da2019c IPC::Connection::dispatchOneMessage() + 0x72 55 com.apple.JavaScriptCore 0x10e633d12 WTF::RunLoop::performWork() + 0x352 56 com.apple.JavaScriptCore 0x10e634232 WTF::RunLoop::performWork(void*) + 0x22 57 com.apple.CoreFoundation 0x7fff8fc57461 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 0x11 58 com.apple.CoreFoundation 0x7fff8fc495ed __CFRunLoopDoSources0 + 0x10d 59 com.apple.CoreFoundation 0x7fff8fc48c1f __CFRunLoopRun + 0x39f 60 com.apple.CoreFoundation 0x7fff8fc48638 CFRunLoopRunSpecific + 0x128 61 com.apple.HIToolbox 0x7fff8a44c7ff RunCurrentEventLoopInMode + 0xeb 62 com.apple.HIToolbox 0x7fff8a44c57a ReceiveNextEventCommon + 0x1af 63 com.apple.HIToolbox 0x7fff8a44c3bb _BlockUntilNextEventMatchingListInModeWithFilter + 0x47 64 com.apple.AppKit 0x7fff88b182d1 _DPSNextEvent + 0x3c4 65 com.apple.AppKit 0x7fff88b17a80 -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 0xc2 66 com.apple.AppKit 0x7fff88b0ba33 -[NSApplication run] + 0x252 67 com.apple.AppKit 0x7fff88af6eb4 NSApplicationMain + 0x728 68 libxpc.dylib 0x7fff8a90def2 _xpc_objc_main + 0x319 69 libxpc.dylib 0x7fff8a90fa9d xpc_main + 0x1ea 70 com.apple.WebKit.WebContent.Development 0x0000000106caf620 0x106cae000 + 5664 71 libdyld.dylib 0x7fff907195c9 start + 0x1 1052513 1 koivisto 2014-12-04 11:13:22 -0800 rdar://problem/18431960 1052516 2 242577 koivisto 2014-12-04 11:22:01 -0800 Created attachment 242577 patch 1052520 3 242577 joepeck 2014-12-04 11:30:44 -0800 Comment on attachment 242577 patch Looks fine to me. Someone more familiar with NetworkResourceLoader should do a final review (and I am not a WebKit2 Owner). 1052521 4 242577 ap 2014-12-04 11:37:45 -0800 Comment on attachment 242577 patch r=me Alternatively, could we remove the loader from NetworkConnectionToWebProcess::m_networkResourceLoaders earlier? I think that this would be more robust, and having less state to track is always better. We don't want any IPC messages to be delivered to the loader after cleanup(), not just setDefersLoading. 1052524 5 koivisto 2014-12-04 11:43:43 -0800 Yeah, good idea. Let's see... 1052538 6 242581 koivisto 2014-12-04 12:43:53 -0800 Created attachment 242581 alternative patch 1052546 7 242583 koivisto 2014-12-04 12:58:32 -0800 Created attachment 242583 updated alternative patch 1052578 8 242583 commit-queue 2014-12-04 14:47:55 -0800 Comment on attachment 242583 updated alternative patch Clearing flags on attachment: 242583 Committed r176818: <http://trac.webkit.org/changeset/176818> 1052579 9 commit-queue 2014-12-04 14:47:59 -0800 All reviewed patches have been landed. Closing bug. 242577 2014-12-04 11:22:01 -0800 2014-12-04 12:43:53 -0800 patch inspector-step-crash.patch text/plain 3517 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjgwMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTEyLTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTczNDY4 KTogQ2Fubm90IHN0ZXAgaW4gV2ViSW5zcGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3IgZGVmZXJzIGFsbCBsb2FkcyBhbmQgc3Rh cnRzIGEgbmVzdGVkIHJ1bmxvb3Agd2hlbiBpdCBoaXRzIGEgYnJlYWtwb2ludC4gV2hlbiBjb250 aW51aW5nIGl0IHVuZGVmZXJzIHRoZSBsb2Fkcy4KKyAgICAgICAgSWYgdGhlIHNjcmlwdCBleGVj dXRpb24gd2FzIHRyaWdnZXJlZCBmcm9tIHRoZSBkaWRGaW5pc2hMb2FkaW5nIGNhbGxiYWNrIG9m IHRoZSBtYWluIHJlc291cmNlIHRoZW4gdGhlIG1haW4gcmVzb3VyY2Ugd291bGQKKyAgICAgICAg YWxyZWFkeSBiZSBpbiB0aGUgZmluaXNoZWQgc3RhdGUgaW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBz aWRlIGFuZCBzZXREZWZlcnNMb2FkaW5nKGZhbHNlKSBtZXNzYWdlIHdvdWxkIGVuZCB1cCByZXN0 YXJ0aW5nIGl0cyBsb2FkLgorICAgICAgICBTaW5jZSBsb2FkcyBhcmUgbm90IG1lYW50IHRvIHJl c3RhcnQgdGhlIGdlbmVyYXRlZCBjYWxsYmFja3Mgd291bGQgYXNzZXJ0IG9yIGNyYXNoIHRoZSB3 ZWIgcHJvY2VzcyB3aGVuIGhhbmRsZWQgaW4gdGhlIG5leHQKKyAgICAgICAgbmVzdGVkIGluc3Bl Y3RvciBydW5sb29wLgorCisgICAgICAgIE5vIHRlc3QsIHRoaXMgcmVxdWlyZXMgSlMgZGVidWdn ZXIgdG8gdHJpZ2dlci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6TmV0 d29ya1Jlc291cmNlTG9hZGVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9h ZGVyOjpzdGFydCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c2V0 RGVmZXJzTG9hZGluZyk6CisKKyAgICAgICAgICAgIFByZXZlbnQgbG9hZCBmcm9tIHN0YXJ0aW5n IGFnYWluIGFmdGVyIGNsZWFudXAuCisgICAgICAgICAgICBDaGVja2luZyB0aGlzIG9uIG5ldHdv cmsgcHJvY2VzcyBzaWRlIGlzIG1vcmUgcm9idXN0IGFzIHRoZSB3ZWIgcHJvY2VzcyBzaWRlIGxv YWRlciBpcyBpbiBhd2t3YXJkIGluLWJldHdlZW4gc3RhdGUKKyAgICAgICAgICAgIHdoZW4gdGhp cyBvY2N1cnMgZHVlIHRvIHVzZSBvZiBuZXN0ZWQgcnVubG9vcCBieSBpbnNwZWN0b3IuCisKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxNC0xMi0wNCAg Q3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVSVEJGIGFm dGVyIHIxNzY3OTQuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDE3Njc1MCkKKysrIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTg4LDYgKzg4LDcgQEAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3 b3JrUmVzb3VyY2VMbwogICAgICwgbV9kaWRDb252ZXJ0SGFuZGxlVG9Eb3dubG9hZChmYWxzZSkK ICAgICAsIG1fZGlkQ29uc3VtZVNhbmRib3hFeHRlbnNpb25zKGZhbHNlKQogICAgICwgbV9kZWZl cnNMb2FkaW5nKHBhcmFtZXRlcnMuZGVmZXJzTG9hZGluZykKKyAgICAsIG1fZGlkQ2xlYW51cChm YWxzZSkKICAgICAsIG1fYnVmZmVyaW5nVGltZXIoKnRoaXMsICZOZXR3b3JrUmVzb3VyY2VMb2Fk ZXI6OmJ1ZmZlcmluZ1RpbWVyRmlyZWQpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigp KTsKQEAgLTEyNiw2ICsxMjcsNyBAQCBib29sIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6aXNTeW5j aHJvbm91CiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogewogICAgIEFTU0VS VChSdW5Mb29wOjppc01haW4oKSk7CisgICAgQVNTRVJUKCFtX2RpZENsZWFudXApOwogCiAgICAg aWYgKG1fZGVmZXJzTG9hZGluZykKICAgICAgICAgcmV0dXJuOwpAQCAtMTQ4LDYgKzE1MCw5IEBA IHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCiAKIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQogeworICAgIC8vIFRoaXMg bWF5IGdldCBpbnZva2VkIGZvciBmaW5pc2hlZCBsb2Fkcy4KKyAgICBpZiAobV9kaWRDbGVhbnVw KQorICAgICAgICByZXR1cm47CiAgICAgaWYgKG1fZGVmZXJzTG9hZGluZyA9PSBkZWZlcnMpCiAg ICAgICAgIHJldHVybjsKICAgICBtX2RlZmVyc0xvYWRpbmcgPSBkZWZlcnM7CkBAIC0xNzUsNiAr MTgwLDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNsZWFudXAoKQogICAgICAgICBt X2hhbmRsZSA9IDA7CiAgICAgICAgIGRlcmVmKCk7CiAgICAgfQorICAgIG1fZGlkQ2xlYW51cCA9 IHRydWU7CiB9CiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRDb252ZXJ0SGFuZGxl VG9Eb3dubG9hZCgpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTc2NzUwKQorKysgU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE3Nyw2ICsxNzcsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9kaWRDb252ZXJ0 SGFuZGxlVG9Eb3dubG9hZDsKICAgICBib29sIG1fZGlkQ29uc3VtZVNhbmRib3hFeHRlbnNpb25z OwogICAgIGJvb2wgbV9kZWZlcnNMb2FkaW5nOworICAgIGJvb2wgbV9kaWRDbGVhbnVwOwogCiAg ICAgV2ViQ29yZTo6VGltZXIgbV9idWZmZXJpbmdUaW1lcjsKIH07Cg== 242581 2014-12-04 12:43:53 -0800 2014-12-04 12:58:32 -0800 alternative patch inspector-step-crash-2.patch text/plain 7440 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjgxMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTEyLTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTczNDY4 KTogQ2Fubm90IHN0ZXAgaW4gV2ViSW5zcGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3IgZGVmZXJzIGFsbCBsb2FkcyBhbmQgc3Rh cnRzIGEgbmVzdGVkIHJ1bmxvb3Agd2hlbiBpdCBoaXRzIGEgYnJlYWtwb2ludC4gV2hlbiBjb250 aW51aW5nIGl0IHVuZGVmZXJzIHRoZSBsb2Fkcy4KKyAgICAgICAgSWYgdGhlIHNjcmlwdCBleGVj dXRpb24gd2FzIHRyaWdnZXJlZCBmcm9tIHRoZSBkaWRGaW5pc2hMb2FkaW5nIGNhbGxiYWNrIG9m IHRoZSBtYWluIHJlc291cmNlIHRoZW4gdGhlIG1haW4gcmVzb3VyY2Ugd291bGQKKyAgICAgICAg YWxyZWFkeSBiZSBpbiB0aGUgZmluaXNoZWQgc3RhdGUgaW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBz aWRlIGFuZCBzZXREZWZlcnNMb2FkaW5nKGZhbHNlKSBtZXNzYWdlIHdvdWxkIGVuZCB1cCByZXN0 YXJ0aW5nIGl0cyBsb2FkLgorICAgICAgICBTaW5jZSBsb2FkcyBhcmUgbm90IG1lYW50IHRvIHJl c3RhcnQgdGhlIGdlbmVyYXRlZCBjYWxsYmFja3Mgd291bGQgYXNzZXJ0IG9yIGNyYXNoIHRoZSB3 ZWIgcHJvY2VzcyB3aGVuIGhhbmRsZWQgaW4gdGhlIG5leHQKKyAgICAgICAgbmVzdGVkIGluc3Bl Y3RvciBydW5sb29wLgorCisgICAgICAgIEZpeCBieSB0YWtpbmcgY2FyZSB0aGF0IGNsZWFuZWQg dXAgTmV0d29ya1Jlc291cmNlTG9hZGVycyBhcmUgYWx3YXlzIHJlbW92ZWQgZnJvbSB0aGUgbG9h ZGVyIG1hcCBvZgorICAgICAgICB0aGUgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgYW5k IHNvIGNhbid0IGVuZCB1cCBoYW5kbGluZyBsYXRlIG1lc3NhZ2VzLgorCisgICAgICAgIE5vIHRl c3QsIHRoaXMgcmVxdWlyZXMgSlMgZGVidWdnZXIgdG8gdHJpZ2dlci4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRpZENsZWFudXBSZXNvdXJj ZUxvYWRlcik6CisKKyAgICAgICAgICAgIFRoaXMgaXMgbm93IHRoZSBvbmx5IHdheSB0byByZW1v dmUgcmVzb3VyY2UgbG9hZGVycy4KKyAgICAgICAgICAgIEl0IGlzIGNhbGxlZCBmcm9tIE5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6Y2xlYW51cCBvbmx5LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpyZW1vdmVMb2FkSWRlbnRpZmllcik6CisKKyAg ICAgICAgICAgIENhbGxpbmcgYWJvcnQgIHJlbW92ZXMgdGhlIHJlc291cmNlIGxvYWRlciAoc2lu Y2UgaXQgY2FsbHMgY2xlYW51cCkgc28gbm8gbmVlZCB0byBkbyBpdCBleHBsaWNpdGx5IGFueW1v cmUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorCisg ICAgICAgICAgICBXZSBhcmUgZ3VhcmFudGVlZCB0byBiZSByZWZmZWQgYnkgTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MgdW50aWwgY2xlYW51cCBzbyB0aGUgZXhwbGljaXQgcmVmL2RlcmVm IGNhbiBiZSByZW1vdmVkLgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6Y2xlYW51cCk6CisKKyAgICAgICAgICAgIENhbGwgdG8gTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OmRpZENsZWFudXBSZXNvdXJjZUxvYWRlciB0byBtYWtlIHRoZSBsb2FkZXIgdW5y ZWFjaGFibGUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjppZGVudGlmaWVy KToKKwogMjAxNC0xMi0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZSBkb2Vz IHN5bmNocm9ub3VzIElQQyBpbiBXZWJLaXQyCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MuY3BwCShyZXZpc2lvbiAxNzY3NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYy LDYgKzYyLDEyIEBAIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpOZXR3b3JrQ28KIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjp+TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MoKQogewogfQorCit2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDbGVh bnVwUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291cmNlTG9hZGVyJiBsb2FkZXIpCit7CisgICAg UmVmUHRyPE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4gcmVtb3ZlZExvYWRlciA9IG1fbmV0d29ya1Jl c291cmNlTG9hZGVycy50YWtlKGxvYWRlci5pZGVudGlmaWVyKCkpOworICAgIEFTU0VSVChyZW1v dmVkTG9hZGVyID09ICZsb2FkZXIpOworfQogICAgIAogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzczo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9u LCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewpAQCAtOTQsMTQgKzEwMCwxMSBAQCB2 b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDCiAgICAgLy8gUHJvdGVjdCBv dXJzZWxmIGFzIHdlIG1pZ2h0IGJlIG90aGVyd2lzZSBiZSBkZWxldGVkIGR1cmluZyB0aGlzIGZ1 bmN0aW9uLgogICAgIFJlZjxOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gcHJvdGVjdG9y KCp0aGlzKTsKIAotICAgIEhhc2hNYXA8UmVzb3VyY2VMb2FkSWRlbnRpZmllciwgUmVmUHRyPE5l dHdvcmtSZXNvdXJjZUxvYWRlcj4+OjppdGVyYXRvciBlbmQgPSBtX25ldHdvcmtSZXNvdXJjZUxv YWRlcnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFJlc291cmNlTG9hZElkZW50aWZpZXIsIFJl ZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+Pjo6aXRlcmF0b3IgaSA9IG1fbmV0d29ya1Jlc291 cmNlTG9hZGVycy5iZWdpbigpOyBpICE9IGVuZDsgKytpKQotICAgICAgICBpLT52YWx1ZS0+YWJv cnQoKTsKKyAgICBmb3IgKGF1dG8mIGxvYWRlckVudHJ5IDogbV9uZXR3b3JrUmVzb3VyY2VMb2Fk ZXJzKQorICAgICAgICBsb2FkZXJFbnRyeS52YWx1ZS0+YWJvcnQoKTsKKyAgICBBU1NFUlQobV9u ZXR3b3JrUmVzb3VyY2VMb2FkZXJzLmlzRW1wdHkoKSk7CiAKICAgICBOZXR3b3JrQmxvYlJlZ2lz dHJ5OjpzaGFyZWQoKS5jb25uZWN0aW9uVG9XZWJQcm9jZXNzRGlkQ2xvc2UodGhpcyk7Ci0KLSAg ICBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuY2xlYXIoKTsKLSAgICAKICAgICBOZXR3b3JrUHJv Y2Vzczo6c2hhcmVkKCkucmVtb3ZlTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3ModGhpcyk7 CiB9CiAKQEAgLTEyNSw3ICsxMjgsNyBAQCB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpwZXJmCiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnJlbW92ZUxv YWRJZGVudGlmaWVyKFJlc291cmNlTG9hZElkZW50aWZpZXIgaWRlbnRpZmllcikKIHsKLSAgICBS ZWZQdHI8TmV0d29ya1Jlc291cmNlTG9hZGVyPiBsb2FkZXIgPSBtX25ldHdvcmtSZXNvdXJjZUxv YWRlcnMudGFrZShpZGVudGlmaWVyKTsKKyAgICBSZWZQdHI8TmV0d29ya1Jlc291cmNlTG9hZGVy PiBsb2FkZXIgPSBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuZ2V0KGlkZW50aWZpZXIpOwogCiAg ICAgLy8gSXQncyBwb3NzaWJsZSB3ZSBoYXZlIG5vIGxvYWRlciBmb3IgdGhpcyBpZGVudGlmaWVy IGlmIHRoZSBOZXR3b3JrUHJvY2VzcyBjcmFzaGVkIGFuZCB0aGlzIHdhcyBhIHJlc3Bhd25lZCBO ZXR3b3JrUHJvY2Vzcy4KICAgICBpZiAoIWxvYWRlcikKQEAgLTEzNCw2ICsxMzcsNyBAQCB2b2lk IE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpyZW1vCiAgICAgLy8gQWJvcnQgdGhlIGxv YWQgbm93LCBhcyB0aGUgV2ViUHJvY2VzcyB3b24ndCBiZSBhYmxlIHRvIHJlc3BvbmQgdG8gbWVz c2FnZXMgYW55IG1vcmUgd2hpY2ggbWlnaHQgbGVhZAogICAgIC8vIHRvIGxlYWtlZCBsb2FkZXIg cmVzb3VyY2VzIChjb25uZWN0aW9ucywgdGhyZWFkcywgZXRjKS4KICAgICBsb2FkZXItPmFib3J0 KCk7CisgICAgQVNTRVJUKCFtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuY29udGFpbnMoaWRlbnRp ZmllcikpOwogfQogCiB2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXREZWZl cnNMb2FkaW5nKFJlc291cmNlTG9hZElkZW50aWZpZXIgaWRlbnRpZmllciwgYm9vbCBkZWZlcnMp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgJKHJldmlzaW9uIDE3Njc1MCkKKysrIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmgJKHdvcmtpbmcgY29weSkKQEAgLTU1LDYgKzU1LDggQEAgcHVibGljOgogCiAgICAgYm9vbCBp c1NlcmlhbExvYWRpbmdFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9zZXJpYWxMb2FkaW5nRW5h YmxlZDsgfQogCisgICAgdm9pZCBkaWRDbGVhbnVwUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291 cmNlTG9hZGVyJik7CisKIHByaXZhdGU6CiAgICAgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MoSVBDOjpDb25uZWN0aW9uOjpJZGVudGlmaWVyKTsKIApJbmRleDogU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCShy ZXZpc2lvbiAxNzY3NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsOSArMTMwLDYgQEAgdm9p ZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0KCkKICAgICBpZiAobV9kZWZlcnNMb2FkaW5n KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBFeHBsaWNpdCByZWYoKSBiYWxhbmNlZCBieSBh IGRlcmVmKCkgaW4gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKCkKLSAgICByZWYoKTsK LQogICAgIG1fbmV0d29ya2luZ0NvbnRleHQgPSBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6Y3Jl YXRlKHNlc3Npb25JRCgpLCBtX3BhcmFtZXRlcnMuc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNU b0hUVFBSZWRpcmVjdCk7CiAKICAgICBjb25zdW1lU2FuZGJveEV4dGVuc2lvbnMoKTsKQEAgLTE2 OSwxMiArMTY2LDEwIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKCkKIAog ICAgIE5ldHdvcmtQcm9jZXNzOjpzaGFyZWQoKS5uZXR3b3JrUmVzb3VyY2VMb2FkU2NoZWR1bGVy KCkucmVtb3ZlTG9hZGVyKHRoaXMpOwogCi0gICAgaWYgKG1faGFuZGxlKSB7Ci0gICAgICAgIC8v IEV4cGxpY2l0IGRlcmVmKCkgYmFsYW5jZWQgYnkgYSByZWYoKSBpbiBOZXR3b3JrUmVzb3VyY2VM b2FkZXI6OnN0YXJ0KCkKLSAgICAgICAgLy8gVGhpcyBtaWdodCBjYXVzZSB0aGUgTmV0d29ya1Jl c291cmNlTG9hZGVyIHRvIGJlIGRlc3Ryb3llZCBhbmQgdGhlcmVmb3JlIHdlIGRvIGl0IGxhc3Qu Ci0gICAgICAgIG1faGFuZGxlID0gMDsKLSAgICAgICAgZGVyZWYoKTsKLSAgICB9CisgICAgbV9o YW5kbGUgPSBudWxscHRyOworCisgICAgLy8gVGhpcyB3aWxsIGNhdXNlIE5ldHdvcmtSZXNvdXJj ZUxvYWRlciB0byBiZSBkZXN0cm95ZWQgYW5kIHRoZXJlZm9yZSB3ZSBkbyBpdCBsYXN0LgorICAg IG1fY29ubmVjdGlvbi0+ZGlkQ2xlYW51cFJlc291cmNlTG9hZGVyKCp0aGlzKTsKIH0KIAogdm9p ZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZENvbnZlcnRIYW5kbGVUb0Rvd25sb2FkKCkKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNv dXJjZUxvYWRlci5oCShyZXZpc2lvbiAxNzY3NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDYg KzEwMSw3IEBAIHB1YmxpYzoKIAogICAgIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKiBj b25uZWN0aW9uVG9XZWJQcm9jZXNzKCkgY29uc3QgeyByZXR1cm4gbV9jb25uZWN0aW9uLmdldCgp OyB9CiAgICAgV2ViQ29yZTo6U2Vzc2lvbklEIHNlc3Npb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1f cGFyYW1ldGVycy5zZXNzaW9uSUQ7IH0KKyAgICBSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlkZW50 aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX3BhcmFtZXRlcnMuaWRlbnRpZmllcjsgfQogCiAgICAg c3RydWN0IFN5bmNocm9ub3VzTG9hZERhdGE7CiAK 242583 2014-12-04 12:58:32 -0800 2014-12-04 14:47:55 -0800 updated alternative patch inspector-step-crash-3.patch text/plain 7519 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjgxMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTEyLTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMTczNDY4 KTogQ2Fubm90IHN0ZXAgaW4gV2ViSW5zcGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyNjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3IgZGVmZXJzIGFsbCBsb2FkcyBhbmQgc3Rh cnRzIGEgbmVzdGVkIHJ1bmxvb3Agd2hlbiBpdCBoaXRzIGEgYnJlYWtwb2ludC4gV2hlbiBjb250 aW51aW5nIGl0IHVuZGVmZXJzIHRoZSBsb2Fkcy4KKyAgICAgICAgSWYgdGhlIHNjcmlwdCBleGVj dXRpb24gd2FzIHRyaWdnZXJlZCBmcm9tIHRoZSBkaWRGaW5pc2hMb2FkaW5nIGNhbGxiYWNrIG9m IHRoZSBtYWluIHJlc291cmNlIHRoZW4gdGhlIG1haW4gcmVzb3VyY2Ugd291bGQKKyAgICAgICAg YWxyZWFkeSBiZSBpbiB0aGUgZmluaXNoZWQgc3RhdGUgaW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBz aWRlIGFuZCBzZXREZWZlcnNMb2FkaW5nKGZhbHNlKSBtZXNzYWdlIHdvdWxkIGVuZCB1cCByZXN0 YXJ0aW5nIGl0cyBsb2FkLgorICAgICAgICBTaW5jZSBsb2FkcyBhcmUgbm90IG1lYW50IHRvIHJl c3RhcnQgdGhlIGdlbmVyYXRlZCBjYWxsYmFja3Mgd291bGQgYXNzZXJ0IG9yIGNyYXNoIHRoZSB3 ZWIgcHJvY2VzcyB3aGVuIGhhbmRsZWQgaW4gdGhlIG5leHQKKyAgICAgICAgbmVzdGVkIGluc3Bl Y3RvciBydW5sb29wLgorCisgICAgICAgIEZpeCBieSB0YWtpbmcgY2FyZSB0aGF0IGNsZWFuZWQg dXAgTmV0d29ya1Jlc291cmNlTG9hZGVycyBhcmUgYWx3YXlzIHJlbW92ZWQgZnJvbSB0aGUgbG9h ZGVyIG1hcCBvZgorICAgICAgICB0aGUgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MgYW5k IHNvIGNhbid0IGVuZCB1cCBoYW5kbGluZyBsYXRlIG1lc3NhZ2VzLgorCisgICAgICAgIE5vIHRl c3QsIHRoaXMgcmVxdWlyZXMgSlMgZGVidWdnZXIgdG8gdHJpZ2dlci4KKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRpZENsZWFudXBSZXNvdXJj ZUxvYWRlcik6CisKKyAgICAgICAgICAgIFRoaXMgaXMgbm93IHRoZSBvbmx5IHdheSB0byByZW1v dmUgcmVzb3VyY2UgbG9hZGVycy4KKyAgICAgICAgICAgIEl0IGlzIGNhbGxlZCBmcm9tIE5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6Y2xlYW51cCBvbmx5LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDbG9zZSk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpyZW1vdmVMb2FkSWRlbnRpZmllcik6CisKKyAg ICAgICAgICAgIENhbGxpbmcgYWJvcnQgIHJlbW92ZXMgdGhlIHJlc291cmNlIGxvYWRlciAoc2lu Y2UgaXQgY2FsbHMgY2xlYW51cCkgc28gbm8gbmVlZCB0byBkbyBpdCBleHBsaWNpdGx5IGFueW1v cmUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQpOgorCisg ICAgICAgICAgICBXZSBhcmUgZ3VhcmFudGVlZCB0byBiZSByZWZmZWQgYnkgTmV0d29ya0Nvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MgdW50aWwgY2xlYW51cCBzbyB0aGUgZXhwbGljaXQgcmVmL2RlcmVm IGNhbiBiZSByZW1vdmVkLgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6Y2xlYW51cCk6CisKKyAgICAgICAgICAgIENhbGwgdG8gTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OmRpZENsZWFudXBSZXNvdXJjZUxvYWRlciB0byBtYWtlIHRoZSBsb2FkZXIgdW5y ZWFjaGFibGUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2Fk ZXIuaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjppZGVudGlmaWVy KToKKwogMjAxNC0xMi0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZSBkb2Vz IHN5bmNocm9ub3VzIElQQyBpbiBXZWJLaXQyCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MuY3BwCShyZXZpc2lvbiAxNzY3NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYy LDYgKzYyLDEyIEBAIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpOZXR3b3JrQ28KIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjp+TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MoKQogewogfQorCit2b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDbGVh bnVwUmVzb3VyY2VMb2FkZXIoTmV0d29ya1Jlc291cmNlTG9hZGVyJiBsb2FkZXIpCit7CisgICAg UmVmUHRyPE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4gcmVtb3ZlZExvYWRlciA9IG1fbmV0d29ya1Jl c291cmNlTG9hZGVycy50YWtlKGxvYWRlci5pZGVudGlmaWVyKCkpOworICAgIEFTU0VSVChyZW1v dmVkTG9hZGVyID09ICZsb2FkZXIpOworfQogICAgIAogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzczo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9u LCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewpAQCAtOTQsMTQgKzEwMCwxMyBAQCB2 b2lkIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpkaWRDCiAgICAgLy8gUHJvdGVjdCBv dXJzZWxmIGFzIHdlIG1pZ2h0IGJlIG90aGVyd2lzZSBiZSBkZWxldGVkIGR1cmluZyB0aGlzIGZ1 bmN0aW9uLgogICAgIFJlZjxOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gcHJvdGVjdG9y KCp0aGlzKTsKIAotICAgIEhhc2hNYXA8UmVzb3VyY2VMb2FkSWRlbnRpZmllciwgUmVmUHRyPE5l dHdvcmtSZXNvdXJjZUxvYWRlcj4+OjppdGVyYXRvciBlbmQgPSBtX25ldHdvcmtSZXNvdXJjZUxv YWRlcnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFJlc291cmNlTG9hZElkZW50aWZpZXIsIFJl ZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+Pjo6aXRlcmF0b3IgaSA9IG1fbmV0d29ya1Jlc291 cmNlTG9hZGVycy5iZWdpbigpOyBpICE9IGVuZDsgKytpKQotICAgICAgICBpLT52YWx1ZS0+YWJv cnQoKTsKKyAgICBWZWN0b3I8UmVmUHRyPE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4+IGxvYWRlcnM7 CisgICAgY29weVZhbHVlc1RvVmVjdG9yKG1fbmV0d29ya1Jlc291cmNlTG9hZGVycywgbG9hZGVy cyk7CisgICAgZm9yIChhdXRvJiBsb2FkZXIgOiBsb2FkZXJzKQorICAgICAgICBsb2FkZXItPmFi b3J0KCk7CisgICAgQVNTRVJUKG1fbmV0d29ya1Jlc291cmNlTG9hZGVycy5pc0VtcHR5KCkpOwog CiAgICAgTmV0d29ya0Jsb2JSZWdpc3RyeTo6c2hhcmVkKCkuY29ubmVjdGlvblRvV2ViUHJvY2Vz c0RpZENsb3NlKHRoaXMpOwotCi0gICAgbV9uZXR3b3JrUmVzb3VyY2VMb2FkZXJzLmNsZWFyKCk7 Ci0gICAgCiAgICAgTmV0d29ya1Byb2Nlc3M6OnNoYXJlZCgpLnJlbW92ZU5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzKHRoaXMpOwogfQogCkBAIC0xMjUsNyArMTMwLDcgQEAgdm9pZCBOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cGVyZgogCiB2b2lkIE5ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzOjpyZW1vdmVMb2FkSWRlbnRpZmllcihSZXNvdXJjZUxvYWRJZGVudGlmaWVy IGlkZW50aWZpZXIpCiB7Ci0gICAgUmVmUHRyPE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4gbG9hZGVy ID0gbV9uZXR3b3JrUmVzb3VyY2VMb2FkZXJzLnRha2UoaWRlbnRpZmllcik7CisgICAgUmVmUHRy PE5ldHdvcmtSZXNvdXJjZUxvYWRlcj4gbG9hZGVyID0gbV9uZXR3b3JrUmVzb3VyY2VMb2FkZXJz LmdldChpZGVudGlmaWVyKTsKIAogICAgIC8vIEl0J3MgcG9zc2libGUgd2UgaGF2ZSBubyBsb2Fk ZXIgZm9yIHRoaXMgaWRlbnRpZmllciBpZiB0aGUgTmV0d29ya1Byb2Nlc3MgY3Jhc2hlZCBhbmQg dGhpcyB3YXMgYSByZXNwYXduZWQgTmV0d29ya1Byb2Nlc3MuCiAgICAgaWYgKCFsb2FkZXIpCkBA IC0xMzQsNiArMTM5LDcgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6cmVt bwogICAgIC8vIEFib3J0IHRoZSBsb2FkIG5vdywgYXMgdGhlIFdlYlByb2Nlc3Mgd29uJ3QgYmUg YWJsZSB0byByZXNwb25kIHRvIG1lc3NhZ2VzIGFueSBtb3JlIHdoaWNoIG1pZ2h0IGxlYWQKICAg ICAvLyB0byBsZWFrZWQgbG9hZGVyIHJlc291cmNlcyAoY29ubmVjdGlvbnMsIHRocmVhZHMsIGV0 YykuCiAgICAgbG9hZGVyLT5hYm9ydCgpOworICAgIEFTU0VSVCghbV9uZXR3b3JrUmVzb3VyY2VM b2FkZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKIH0KIAogdm9pZCBOZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzczo6c2V0RGVmZXJzTG9hZGluZyhSZXNvdXJjZUxvYWRJZGVudGlmaWVyIGlk ZW50aWZpZXIsIGJvb2wgZGVmZXJzKQpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCShy ZXZpc2lvbiAxNzY3NTApCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw4IEBA IHB1YmxpYzoKIAogICAgIGJvb2wgaXNTZXJpYWxMb2FkaW5nRW5hYmxlZCgpIGNvbnN0IHsgcmV0 dXJuIG1fc2VyaWFsTG9hZGluZ0VuYWJsZWQ7IH0KIAorICAgIHZvaWQgZGlkQ2xlYW51cFJlc291 cmNlTG9hZGVyKE5ldHdvcmtSZXNvdXJjZUxvYWRlciYpOworCiBwcml2YXRlOgogICAgIE5ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzKElQQzo6Q29ubmVjdGlvbjo6SWRlbnRpZmllcik7CiAK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMTc2NzUwKQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTMwLDkgKzEzMCw2IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCiAg ICAgaWYgKG1fZGVmZXJzTG9hZGluZykKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRXhwbGlj aXQgcmVmKCkgYmFsYW5jZWQgYnkgYSBkZXJlZigpIGluIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6 Y2xlYW51cCgpCi0gICAgcmVmKCk7Ci0KICAgICBtX25ldHdvcmtpbmdDb250ZXh0ID0gUmVtb3Rl TmV0d29ya2luZ0NvbnRleHQ6OmNyZWF0ZShzZXNzaW9uSUQoKSwgbV9wYXJhbWV0ZXJzLnNob3Vs ZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3QpOwogCiAgICAgY29uc3VtZVNhbmRi b3hFeHRlbnNpb25zKCk7CkBAIC0xNjksMTIgKzE2NiwxMCBAQCB2b2lkIE5ldHdvcmtSZXNvdXJj ZUxvYWRlcjo6Y2xlYW51cCgpCiAKICAgICBOZXR3b3JrUHJvY2Vzczo6c2hhcmVkKCkubmV0d29y a1Jlc291cmNlTG9hZFNjaGVkdWxlcigpLnJlbW92ZUxvYWRlcih0aGlzKTsKIAotICAgIGlmICht X2hhbmRsZSkgewotICAgICAgICAvLyBFeHBsaWNpdCBkZXJlZigpIGJhbGFuY2VkIGJ5IGEgcmVm KCkgaW4gTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzdGFydCgpCi0gICAgICAgIC8vIFRoaXMgbWln aHQgY2F1c2UgdGhlIE5ldHdvcmtSZXNvdXJjZUxvYWRlciB0byBiZSBkZXN0cm95ZWQgYW5kIHRo ZXJlZm9yZSB3ZSBkbyBpdCBsYXN0LgotICAgICAgICBtX2hhbmRsZSA9IDA7Ci0gICAgICAgIGRl cmVmKCk7Ci0gICAgfQorICAgIG1faGFuZGxlID0gbnVsbHB0cjsKKworICAgIC8vIFRoaXMgd2ls bCBjYXVzZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIgdG8gYmUgZGVzdHJveWVkIGFuZCB0aGVyZWZv cmUgd2UgZG8gaXQgbGFzdC4KKyAgICBtX2Nvbm5lY3Rpb24tPmRpZENsZWFudXBSZXNvdXJjZUxv YWRlcigqdGhpcyk7CiB9CiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRDb252ZXJ0 SGFuZGxlVG9Eb3dubG9hZCgpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTc2NzUwKQorKysg U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEsNyBAQCBwdWJsaWM6CiAKICAgICBOZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2VzcyogY29ubmVjdGlvblRvV2ViUHJvY2VzcygpIGNvbnN0IHsgcmV0 dXJuIG1fY29ubmVjdGlvbi5nZXQoKTsgfQogICAgIFdlYkNvcmU6OlNlc3Npb25JRCBzZXNzaW9u SUQoKSBjb25zdCB7IHJldHVybiBtX3BhcmFtZXRlcnMuc2Vzc2lvbklEOyB9CisgICAgUmVzb3Vy Y2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9wYXJhbWV0ZXJz LmlkZW50aWZpZXI7IH0KIAogICAgIHN0cnVjdCBTeW5jaHJvbm91c0xvYWREYXRhOwogCg==