191814 2018-11-17 14:20:04 -0800 Regression(r238330): A lot of WebInspector tests are crashing on the bots 2018-11-19 01:14:27 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=191812 InRadar P2 Normal --- 191740 1 cdumez joepeck bburg commit-queue hi inspector-bugzilla-changes joepeck rniwa ryanhaddad timothy tsavell webkit-bug-importer oldest_to_newest 1479973 0 cdumez 2018-11-17 14:20:04 -0800 A lot of WebInspector tests are crashing on the bots: https://build.webkit.org/results/Apple%20High%20Sierra%20Debug%20WK2%20(Tests)/r238350%20(5589)/results.html I believe this started with PSON support. Crash: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x00000002890826e0 WTFCrash + 16 (Assertions.cpp:255) 1 com.apple.WebCore 0x000000027800b92b WTFCrashWithInfo(int, char const*, char const*, int) + 27 2 com.apple.WebCore 0x000000027a7350a0 WebCore::InspectorController::show() + 112 (InspectorController.cpp:356) 3 com.apple.WebKit 0x00000001036f482c WebKit::WebInspector::show() + 76 (WebInspector.cpp:126) 4 com.apple.WebKit 0x00000001035275fd WKBundleInspectorShow + 29 (WKBundleInspector.cpp:44) 5 com.apple.WebKitTestRunner.InjectedBundle 0x0000000290a55441 WTR::TestRunner::showWebInspector() + 49 (TestRunner.cpp:635) 6 com.apple.WebKitTestRunner.InjectedBundle 0x0000000290a4a1d7 WTR::JSTestRunner::showWebInspector(OpaqueJSContext const*, OpaqueJSValue*, OpaqueJSValue*, unsigned long, OpaqueJSValue const* const*, OpaqueJSValue const**) + 87 (JSTestRunner.cpp:1301) 7 com.apple.JavaScriptCore 0x00000002895c0f31 long long JSC::APICallbackFunction::call<JSC::JSCallbackFunction>(JSC::ExecState*) + 577 (APICallbackFunction.h:63) 8 ??? 0x0000031bb609a02d 0 + 3417553084461 9 com.apple.JavaScriptCore 0x000000028953cd3d llint_entry + 77901 10 com.apple.JavaScriptCore 0x000000028953cd3d llint_entry + 77901 11 com.apple.JavaScriptCore 0x0000000289529a79 vmEntryToJavaScript + 273 12 com.apple.JavaScriptCore 0x000000028a17659e JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*) + 206 (JITCodeInlines.h:38) 13 com.apple.JavaScriptCore 0x000000028a176c39 JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 1433 (Interpreter.cpp:891) 14 com.apple.JavaScriptCore 0x000000028a43e52c JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 236 (CallData.cpp:41) 15 com.apple.JavaScriptCore 0x000000028a43e61a JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&, WTF::NakedPtr<JSC::Exception>&) + 218 (CallData.cpp:48) 16 com.apple.JavaScriptCore 0x000000028a43e90e JSC::profiledCall(JSC::ExecState*, JSC::ProfilingReason, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&, WTF::NakedPtr<JSC::Exception>&) + 142 (CallData.cpp:69) 17 com.apple.WebCore 0x0000000279b7c11b WebCore::JSExecState::profiledCall(JSC::ExecState*, JSC::ProfilingReason, JSC::JSValue, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&, WTF::NakedPtr<JSC::Exception>&) + 139 (JSExecState.h:74) 18 com.apple.WebCore 0x0000000279bbfa94 WebCore::JSEventListener::handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event&) + 2004 (JSEventListener.cpp:175) 19 com.apple.WebCore 0x000000027a190aec WebCore::EventTarget::innerInvokeEventListeners(WebCore::Event&, WTF::Vector<WTF::RefPtr<WebCore::RegisteredEventListener, WTF::DumbPtrTraits<WebCore::RegisteredEventListener> >, 1ul, WTF::CrashOnOverflow, 16ul>, WebCore::EventTarget::EventInvokePhase) + 1020 (EventTarget.cpp:302) 20 com.apple.WebCore 0x000000027a18c4c2 WebCore::EventTarget::fireEventListeners(WebCore::Event&, WebCore::EventTarget::EventInvokePhase) + 354 (EventTarget.cpp:242) 21 com.apple.WebCore 0x000000027aa7d1e1 WebCore::DOMWindow::dispatchEvent(WebCore::Event&, WebCore::EventTarget*) + 449 (DOMWindow.cpp:2027) 22 com.apple.WebCore 0x000000027aa87495 WebCore::DOMWindow::dispatchLoadEvent() + 309 (DOMWindow.cpp:1976) 23 com.apple.WebCore 0x000000027a0ad768 WebCore::Document::dispatchWindowLoadEvent() + 136 (Document.cpp:4536) 24 com.apple.WebCore 0x000000027a0a5d33 WebCore::Document::implicitClose() + 547 (Document.cpp:2959) 25 com.apple.WebCore 0x000000027a918c4b WebCore::FrameLoader::checkCallImplicitClose() + 155 (FrameLoader.cpp:952) 26 com.apple.WebCore 0x000000027a9186e4 WebCore::FrameLoader::checkCompleted() + 532 (FrameLoader.cpp:894) 27 com.apple.WebCore 0x000000027a91875d WebCore::FrameLoader::loadDone(WebCore::LoadCompletionType) + 45 (FrameLoader.cpp:794) 28 com.apple.WebCore 0x000000027aa144f6 WebCore::CachedResourceLoader::loadDone(WebCore::LoadCompletionType, bool) + 214 (CachedResourceLoader.cpp:1319) 29 com.apple.WebCore 0x000000027a98d3cd WebCore::SubresourceLoader::notifyDone(WebCore::LoadCompletionType) + 125 (SubresourceLoader.cpp:743) 30 com.apple.WebCore 0x000000027a98b178 WebCore::SubresourceLoader::didFinishLoading(WebCore::NetworkLoadMetrics const&) + 984 (SubresourceLoader.cpp:644) 31 com.apple.WebKit 0x000000010355f55d WebKit::WebResourceLoader::didFinishResourceLoad(WebCore::NetworkLoadMetrics const&) + 445 (WebResourceLoader.cpp:162) 32 com.apple.WebKit 0x000000010392e92a void IPC::callMemberFunctionImpl<WebKit::WebResourceLoader, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&), std::__1::tuple<WebCore::NetworkLoadMetrics>, 0ul>(WebKit::WebResourceLoader*, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&), std::__1::tuple<WebCore::NetworkLoadMetrics>&&, std::__1::integer_sequence<unsigned long, 0ul>) + 154 (HandleMessage.h:42) 33 com.apple.WebKit 0x000000010392e7b0 void IPC::callMemberFunction<WebKit::WebResourceLoader, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&), std::__1::tuple<WebCore::NetworkLoadMetrics>, std::__1::integer_sequence<unsigned long, 0ul> >(std::__1::tuple<WebCore::NetworkLoadMetrics>&&, WebKit::WebResourceLoader*, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&)) + 96 (HandleMessage.h:48) 34 com.apple.WebKit 0x000000010392d8f8 void IPC::handleMessage<Messages::WebResourceLoader::DidFinishResourceLoad, WebKit::WebResourceLoader, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&)>(IPC::Decoder&, WebKit::WebResourceLoader*, void (WebKit::WebResourceLoader::*)(WebCore::NetworkLoadMetrics const&)) + 296 (HandleMessage.h:134) 35 com.apple.WebKit 0x000000010392cf2c WebKit::WebResourceLoader::didReceiveWebResourceLoaderMessage(IPC::Connection&, IPC::Decoder&) + 636 (WebResourceLoaderMessageReceiver.cpp:67) 36 com.apple.WebKit 0x0000000103550546 WebKit::NetworkProcessConnection::didReceiveMessage(IPC::Connection&, IPC::Decoder&) + 166 (NetworkProcessConnection.cpp:79) 37 com.apple.WebKit 0x000000010271c2dc IPC::Connection::dispatchMessage(IPC::Decoder&) + 476 (Connection.cpp:979) 38 com.apple.WebKit 0x000000010270e6f1 IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) + 721 39 com.apple.WebKit 0x000000010271d0a7 IPC::Connection::dispatchOneIncomingMessage() + 1607 (Connection.cpp:1074) 40 com.apple.WebKit 0x000000010273dbb8 IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >)::$_14::operator()() + 104 (Connection.cpp:957) 41 com.apple.WebKit 0x000000010273dac9 WTF::Function<void ()>::CallableWrapper<IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >)::$_14>::call() + 25 (Function.h:101) 42 com.apple.JavaScriptCore 0x00000002890a9efd WTF::Function<void ()>::operator()() const + 173 (Function.h:56) 43 com.apple.JavaScriptCore 0x0000000289102c9d WTF::RunLoop::performWork() + 445 (RunLoop.cpp:124) 44 com.apple.JavaScriptCore 0x0000000289103544 WTF::RunLoop::performWork(void*) + 36 (RunLoopCF.cpp:38) 45 com.apple.CoreFoundation 0x00007fff38eb9d81 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE0_PERFORM_FUNCTION__ + 17 46 com.apple.CoreFoundation 0x00007fff38f7165c __CFRunLoopDoSource0 + 108 47 com.apple.CoreFoundation 0x00007fff38e9cd30 __CFRunLoopDoSources0 + 208 48 com.apple.CoreFoundation 0x00007fff38e9c1ad __CFRunLoopRun + 1293 49 com.apple.CoreFoundation 0x00007fff38e9ba07 CFRunLoopRunSpecific + 487 50 com.apple.HIToolbox 0x00007fff38179d96 RunCurrentEventLoopInMode + 286 51 com.apple.HIToolbox 0x00007fff38179b06 ReceiveNextEventCommon + 613 52 com.apple.HIToolbox 0x00007fff38179884 _BlockUntilNextEventMatchingListInModeWithFilter + 64 53 com.apple.AppKit 0x00007fff3642ca73 _DPSNextEvent + 2085 54 com.apple.AppKit 0x00007fff36bc2e34 -[NSApplication(NSEvent) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 3044 55 com.apple.AppKit 0x00007fff36421885 -[NSApplication run] + 764 56 com.apple.AppKit 0x00007fff363f0a72 NSApplicationMain + 804 57 libxpc.dylib 0x00007fff6159af57 _xpc_objc_main + 580 58 libxpc.dylib 0x00007fff61599baa xpc_main + 417 59 com.apple.WebKit.WebContent 0x00000001026c3084 WebKit::XPCServiceMain(int, char const**) + 1188 60 com.apple.WebKit.WebContent 0x00000001026c3372 main + 34 61 libdyld.dylib 0x00007fff61240015 start + 1 1479974 1 cdumez 2018-11-17 14:21:02 -0800 ASSERT(!hasRemoteFrontend()); in InspectorController::show(). 1480129 2 355254 joepeck 2018-11-18 21:58:56 -0800 Created attachment 355254 [PATCH] Proposed Fix 1480131 3 joepeck 2018-11-18 22:02:57 -0800 I don't know how I did not catch this in my own local testing or EWS when the patch first went up... 1480132 4 355254 cdumez 2018-11-18 22:06:25 -0800 Comment on attachment 355254 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=355254&action=review > Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h:32 > +class WebPageInspectorTargetAgent final : public Inspector::InspectorTargetAgent, Inspector::FrontendChannel { Shouldn’t this be public inheritance? 1480133 5 cdumez 2018-11-18 22:07:03 -0800 (In reply to Joseph Pecoraro from comment #3) > I don't know how I did not catch this in my own local testing or EWS when > the patch first went up... There is no debug wk2 EWS. 1480135 6 355254 joepeck 2018-11-18 22:10:00 -0800 Comment on attachment 355254 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=355254&action=review >> Source/WebKit/UIProcess/WebPageInspectorTargetAgent.h:32 >> +class WebPageInspectorTargetAgent final : public Inspector::InspectorTargetAgent, Inspector::FrontendChannel { > > Shouldn’t this be public inheritance? Ahh, yes I'll do that. 1480136 7 355256 joepeck 2018-11-18 22:12:34 -0800 Created attachment 355256 [PATCH] Proposed Fix 1480168 8 355256 commit-queue 2018-11-19 01:13:56 -0800 Comment on attachment 355256 [PATCH] Proposed Fix Clearing flags on attachment: 355256 Committed r238370: <https://trac.webkit.org/changeset/238370> 1480169 9 commit-queue 2018-11-19 01:13:58 -0800 All reviewed patches have been landed. Closing bug. 1480170 10 webkit-bug-importer 2018-11-19 01:14:27 -0800 <rdar://problem/46164164> 355254 2018-11-18 21:58:56 -0800 2018-11-18 22:12:34 -0800 [PATCH] Proposed Fix channel-1.patch text/plain 4029 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZWVkZTEzMDk3ZDkuLjI5NWIzNTE0NWYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDE4LTExLTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CisKKyAgICAgICAgUmVncmVzc2lvbihyMjM4MzMwKTogQSBsb3Qgb2YgV2ViSW5zcGVjdG9yIHRl c3RzIGFyZSBjcmFzaGluZyBvbiB0aGUgYm90cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxODE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIHRoZSBleHBlY3RlZCBjb25uZWN0aW9uIHR5cGUg ZnJvbSB0aGUgVUlQcm9jZXNzIGludG8gdGhlIFdlYlByb2Nlc3MuCisgICAgICAgIFdoZW4gdGhl cmUgaXMgYSBsb2NhbCBpbnNwZWN0b3IgY29ubmVjdGlvbiB0byB0aGUgVUlQcm9jZXNzIGV4cG9z ZSBpdCBhcworICAgICAgICBhIGxvY2FsIGZyb250ZW5kIGNoYW5uZWwgdG8gdGhlIGluc3BlY3Rv ciBjb250cm9sbGVycyBpbiB0aGUgUGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl SW5zcGVjdG9yVGFyZ2V0QWdlbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUluc3Bl Y3RvclRhcmdldEFnZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUluc3BlY3RvclRh cmdldEFnZW50Ojpmcm9udGVuZENoYW5uZWwpOgorICAgICAgICBBbiBhZGRpdGlvbmFsIEZyb250 ZW5kQ2hhbm5lbCBjbGFzcyBpcyBub3QgbmVlZGVkLCBqdXN0IHVzZSBzZWxmLgorCisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudDo6V2ViUGFnZUluc3BlY3RvclRh cmdldEFnZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50 Ojpjb25uZWN0aW9uVHlwZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VJbnNwZWN0 b3JUYXJnZXRBZ2VudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKToKKyAgICAgICAgRXhwb3NlIHRo ZSBjaGFubmVsIHRvIHRhcmdldHMgYXMgbG9jYWwgaWYgdGhlcmUgaXMgYSBsb2NhbCBmcm9udGVu ZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLgorCiAyMDE4LTExLTE3ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9tZXNzYWdl UmVjZWl2ZXJzLmNvbnRhaW5zKC4uLikgdW5kZXIgVmlld0dlc3R1cmVDb250cm9sbGVyIHJlbW92 ZU1lc3NhZ2VSZWNlaXZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZUluc3BlY3RvclRhcmdldEFnZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudC5jcHAKaW5kZXggNWZlOTljNTdhYWUuLjRjZmMzOTBh NWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5zcGVjdG9y VGFyZ2V0QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VJbnNw ZWN0b3JUYXJnZXRBZ2VudC5jcHAKQEAgLTI4LDIxICsyOCwyNiBAQAogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAotY2xhc3MgU3R1YkZyb250ZW5kQ2hhbm5lbCBmaW5hbCA6IHB1YmxpYyBJbnNwZWN0 b3I6OkZyb250ZW5kQ2hhbm5lbCB7Ci0gICAgQ29ubmVjdGlvblR5cGUgY29ubmVjdGlvblR5cGUo KSBjb25zdCBmaW5hbCB7IHJldHVybiBJbnNwZWN0b3I6OkZyb250ZW5kQ2hhbm5lbDo6Q29ubmVj dGlvblR5cGU6OlJlbW90ZTsgfQotICAgIHZvaWQgc2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0 IFN0cmluZyYpIGZpbmFsIHsgfQotfTsKLQogV2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50OjpX ZWJQYWdlSW5zcGVjdG9yVGFyZ2V0QWdlbnQoSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlciYgZnJv bnRlbmRSb3V0ZXIsIEluc3BlY3Rvcjo6QmFja2VuZERpc3BhdGNoZXImIGJhY2tlbmREaXNwYXRj aGVyKQogICAgIDogSW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2VudChmcm9udGVuZFJvdXRl ciwgYmFja2VuZERpc3BhdGNoZXIpCisgICAgLCBtX3JvdXRlcihmcm9udGVuZFJvdXRlcikKIHsK IH0KIAogSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWwmIFdlYlBhZ2VJbnNwZWN0b3JUYXJnZXRB Z2VudDo6ZnJvbnRlbmRDaGFubmVsKCkKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmRDaGFubmVsKQot ICAgICAgICBtX2Zyb250ZW5kQ2hhbm5lbCA9IHN0ZDo6bWFrZV91bmlxdWU8U3R1YkZyb250ZW5k Q2hhbm5lbD4oKTsKLSAgICByZXR1cm4gKm1fZnJvbnRlbmRDaGFubmVsLmdldCgpOworICAgIHJl dHVybiAqdGhpczsKK30KKworSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWw6OkNvbm5lY3Rpb25U eXBlIFdlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudDo6Y29ubmVjdGlvblR5cGUoKSBjb25zdAor eworICAgIHJldHVybiBtX3JvdXRlci5oYXNMb2NhbEZyb250ZW5kKCkgPyBJbnNwZWN0b3I6OkZy b250ZW5kQ2hhbm5lbDo6Q29ubmVjdGlvblR5cGU6OkxvY2FsIDogSW5zcGVjdG9yOjpGcm9udGVu ZENoYW5uZWw6OkNvbm5lY3Rpb25UeXBlOjpSZW1vdGU7Cit9CisKK3ZvaWQgV2ViUGFnZUluc3Bl Y3RvclRhcmdldEFnZW50OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJikKK3sK KyAgICAvLyBJbnRlbnRpb25hbGx5IGlnbm9yZWQsIHRoaXMgY2hhbm5lbCBpcyBub3QgYWN0dWFs bHkgdXNlZCB0byBzZW5kIG1lc3NhZ2VzLgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50LmgKaW5kZXggMzhkZTkyODExOWMuLjA1ZDJl NzI2YjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5zcGVj dG9yVGFyZ2V0QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5z cGVjdG9yVGFyZ2V0QWdlbnQuaApAQCAtMjksMTUgKzI5LDIwIEBACiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1jbGFzcyBXZWJQYWdlSW5zcGVjdG9yVGFyZ2V0QWdlbnQgZmluYWwgOiBwdWJsaWMg SW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2VudCB7CitjbGFzcyBXZWJQYWdlSW5zcGVjdG9y VGFyZ2V0QWdlbnQgZmluYWwgOiBwdWJsaWMgSW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2Vu dCwgSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWwgewogcHVibGljOgogICAgIFdlYlBhZ2VJbnNw ZWN0b3JUYXJnZXRBZ2VudChJbnNwZWN0b3I6OkZyb250ZW5kUm91dGVyJiwgSW5zcGVjdG9yOjpC YWNrZW5kRGlzcGF0Y2hlciYpOwogICAgIHZpcnR1YWwgfldlYlBhZ2VJbnNwZWN0b3JUYXJnZXRB Z2VudCgpID0gZGVmYXVsdDsKIAogcHJpdmF0ZToKKyAgICAvLyBJbnNwZWN0b3I6Okluc3BlY3Rv clRhcmdldEFnZW50CiAgICAgSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWwmIGZyb250ZW5kQ2hh bm5lbCgpIGZpbmFsOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEluc3BlY3Rvcjo6RnJvbnRlbmRD aGFubmVsPiBtX2Zyb250ZW5kQ2hhbm5lbDsKKyAgICAvLyBJbnNwZWN0b3I6OkZyb250ZW5kQ2hh bm5lbAorICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsOjpDb25uZWN0aW9uVHlwZSBjb25u ZWN0aW9uVHlwZSgpIGNvbnN0IGZpbmFsOworICAgIHZvaWQgc2VuZE1lc3NhZ2VUb0Zyb250ZW5k KGNvbnN0IFN0cmluZyYpIGZpbmFsOworCisgICAgSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlciYg bV9yb3V0ZXI7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 355256 2018-11-18 22:12:34 -0800 2018-11-19 01:13:56 -0800 [PATCH] Proposed Fix channel-2.patch text/plain 4036 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZWVkZTEzMDk3ZDkuLjI5NWIzNTE0NWYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDE4LTExLTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CisKKyAgICAgICAgUmVncmVzc2lvbihyMjM4MzMwKTogQSBsb3Qgb2YgV2ViSW5zcGVjdG9yIHRl c3RzIGFyZSBjcmFzaGluZyBvbiB0aGUgYm90cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxODE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIHRoZSBleHBlY3RlZCBjb25uZWN0aW9uIHR5cGUg ZnJvbSB0aGUgVUlQcm9jZXNzIGludG8gdGhlIFdlYlByb2Nlc3MuCisgICAgICAgIFdoZW4gdGhl cmUgaXMgYSBsb2NhbCBpbnNwZWN0b3IgY29ubmVjdGlvbiB0byB0aGUgVUlQcm9jZXNzIGV4cG9z ZSBpdCBhcworICAgICAgICBhIGxvY2FsIGZyb250ZW5kIGNoYW5uZWwgdG8gdGhlIGluc3BlY3Rv ciBjb250cm9sbGVycyBpbiB0aGUgUGFnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl SW5zcGVjdG9yVGFyZ2V0QWdlbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUluc3Bl Y3RvclRhcmdldEFnZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUluc3BlY3RvclRh cmdldEFnZW50Ojpmcm9udGVuZENoYW5uZWwpOgorICAgICAgICBBbiBhZGRpdGlvbmFsIEZyb250 ZW5kQ2hhbm5lbCBjbGFzcyBpcyBub3QgbmVlZGVkLCBqdXN0IHVzZSBzZWxmLgorCisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudDo6V2ViUGFnZUluc3BlY3RvclRh cmdldEFnZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50 Ojpjb25uZWN0aW9uVHlwZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VJbnNwZWN0 b3JUYXJnZXRBZ2VudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKToKKyAgICAgICAgRXhwb3NlIHRo ZSBjaGFubmVsIHRvIHRhcmdldHMgYXMgbG9jYWwgaWYgdGhlcmUgaXMgYSBsb2NhbCBmcm9udGVu ZAorICAgICAgICBpbiB0aGUgVUlQcm9jZXNzLgorCiAyMDE4LTExLTE3ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9tZXNzYWdl UmVjZWl2ZXJzLmNvbnRhaW5zKC4uLikgdW5kZXIgVmlld0dlc3R1cmVDb250cm9sbGVyIHJlbW92 ZU1lc3NhZ2VSZWNlaXZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZUluc3BlY3RvclRhcmdldEFnZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudC5jcHAKaW5kZXggNWZlOTljNTdhYWUuLjRjZmMzOTBh NWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5zcGVjdG9y VGFyZ2V0QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VJbnNw ZWN0b3JUYXJnZXRBZ2VudC5jcHAKQEAgLTI4LDIxICsyOCwyNiBAQAogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAotY2xhc3MgU3R1YkZyb250ZW5kQ2hhbm5lbCBmaW5hbCA6IHB1YmxpYyBJbnNwZWN0 b3I6OkZyb250ZW5kQ2hhbm5lbCB7Ci0gICAgQ29ubmVjdGlvblR5cGUgY29ubmVjdGlvblR5cGUo KSBjb25zdCBmaW5hbCB7IHJldHVybiBJbnNwZWN0b3I6OkZyb250ZW5kQ2hhbm5lbDo6Q29ubmVj dGlvblR5cGU6OlJlbW90ZTsgfQotICAgIHZvaWQgc2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0 IFN0cmluZyYpIGZpbmFsIHsgfQotfTsKLQogV2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50OjpX ZWJQYWdlSW5zcGVjdG9yVGFyZ2V0QWdlbnQoSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlciYgZnJv bnRlbmRSb3V0ZXIsIEluc3BlY3Rvcjo6QmFja2VuZERpc3BhdGNoZXImIGJhY2tlbmREaXNwYXRj aGVyKQogICAgIDogSW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2VudChmcm9udGVuZFJvdXRl ciwgYmFja2VuZERpc3BhdGNoZXIpCisgICAgLCBtX3JvdXRlcihmcm9udGVuZFJvdXRlcikKIHsK IH0KIAogSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWwmIFdlYlBhZ2VJbnNwZWN0b3JUYXJnZXRB Z2VudDo6ZnJvbnRlbmRDaGFubmVsKCkKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmRDaGFubmVsKQot ICAgICAgICBtX2Zyb250ZW5kQ2hhbm5lbCA9IHN0ZDo6bWFrZV91bmlxdWU8U3R1YkZyb250ZW5k Q2hhbm5lbD4oKTsKLSAgICByZXR1cm4gKm1fZnJvbnRlbmRDaGFubmVsLmdldCgpOworICAgIHJl dHVybiAqdGhpczsKK30KKworSW5zcGVjdG9yOjpGcm9udGVuZENoYW5uZWw6OkNvbm5lY3Rpb25U eXBlIFdlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudDo6Y29ubmVjdGlvblR5cGUoKSBjb25zdAor eworICAgIHJldHVybiBtX3JvdXRlci5oYXNMb2NhbEZyb250ZW5kKCkgPyBJbnNwZWN0b3I6OkZy b250ZW5kQ2hhbm5lbDo6Q29ubmVjdGlvblR5cGU6OkxvY2FsIDogSW5zcGVjdG9yOjpGcm9udGVu ZENoYW5uZWw6OkNvbm5lY3Rpb25UeXBlOjpSZW1vdGU7Cit9CisKK3ZvaWQgV2ViUGFnZUluc3Bl Y3RvclRhcmdldEFnZW50OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJikKK3sK KyAgICAvLyBJbnRlbnRpb25hbGx5IGlnbm9yZWQsIHRoaXMgY2hhbm5lbCBpcyBub3QgYWN0dWFs bHkgdXNlZCB0byBzZW5kIG1lc3NhZ2VzLgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VJbnNwZWN0b3JUYXJnZXRBZ2VudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZUluc3BlY3RvclRhcmdldEFnZW50LmgKaW5kZXggMzhkZTkyODExOWMuLjhkZDZj Y2QzZTVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5zcGVj dG9yVGFyZ2V0QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlSW5z cGVjdG9yVGFyZ2V0QWdlbnQuaApAQCAtMjksMTUgKzI5LDIwIEBACiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1jbGFzcyBXZWJQYWdlSW5zcGVjdG9yVGFyZ2V0QWdlbnQgZmluYWwgOiBwdWJsaWMg SW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2VudCB7CitjbGFzcyBXZWJQYWdlSW5zcGVjdG9y VGFyZ2V0QWdlbnQgZmluYWwgOiBwdWJsaWMgSW5zcGVjdG9yOjpJbnNwZWN0b3JUYXJnZXRBZ2Vu dCwgcHVibGljIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsIHsKIHB1YmxpYzoKICAgICBXZWJQ YWdlSW5zcGVjdG9yVGFyZ2V0QWdlbnQoSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlciYsIEluc3Bl Y3Rvcjo6QmFja2VuZERpc3BhdGNoZXImKTsKICAgICB2aXJ0dWFsIH5XZWJQYWdlSW5zcGVjdG9y VGFyZ2V0QWdlbnQoKSA9IGRlZmF1bHQ7CiAKIHByaXZhdGU6CisgICAgLy8gSW5zcGVjdG9yOjpJ bnNwZWN0b3JUYXJnZXRBZ2VudAogICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsJiBmcm9u dGVuZENoYW5uZWwoKSBmaW5hbDsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3I6OkZy b250ZW5kQ2hhbm5lbD4gbV9mcm9udGVuZENoYW5uZWw7CisgICAgLy8gSW5zcGVjdG9yOjpGcm9u dGVuZENoYW5uZWwKKyAgICBJbnNwZWN0b3I6OkZyb250ZW5kQ2hhbm5lbDo6Q29ubmVjdGlvblR5 cGUgY29ubmVjdGlvblR5cGUoKSBjb25zdCBmaW5hbDsKKyAgICB2b2lkIHNlbmRNZXNzYWdlVG9G cm9udGVuZChjb25zdCBTdHJpbmcmKSBmaW5hbDsKKworICAgIEluc3BlY3Rvcjo6RnJvbnRlbmRS b3V0ZXImIG1fcm91dGVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==