197230 2019-04-24 03:26:41 -0700 [REGRESSION(r243197)][GStreamer] http/tests/media/clearkey/collect-webkit-media-session.html hits an ASSERT 2019-04-25 00:48:18 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris webkit-bug-importer oldest_to_newest 1529938 0 pnormand 2019-04-24 03:26:41 -0700 Thread 1 (Thread 0x7f3fdb7fe700 (LWP 31235)): #0 WTFCrash () at ../../Source/WTF/wtf/Assertions.cpp:305 #1 0x00007f40a8893f3d in _ZN7WebCore26ContextDestructionObserver14observeContextEPNS_22ScriptExecutionContextE (this=0x7f402e82d090, scriptExecutionContext=0x0) at ../../Source/WebCore/dom/ContextDestructionObserver.cpp:48 #2 0x00007f40a8893ea7 in _ZN7WebCore26ContextDestructionObserverD2Ev (this=0x7f402e82d090, __in_chrg=<optimized out>) at ../../Source/WebCore/dom/ContextDestructionObserver.cpp:42 #3 0x00007f40a8f5c754 in _ZN7WebCore19MediaResourceLoaderD2Ev (this=0x7f402e82d078, __in_chrg=<optimized out>) at ../../Source/WebCore/loader/MediaResourceLoader.cpp:52 #4 0x00007f40a8f5c794 in _ZN7WebCore19MediaResourceLoaderD0Ev (this=0x7f402e82d078, __in_chrg=<optimized out>) at ../../Source/WebCore/loader/MediaResourceLoader.cpp:55 #5 0x00007f40a75238ef in _ZNK3WTF20ThreadSafeRefCountedIN7WebCore27PlatformMediaResourceLoaderELNS_17DestructionThreadE0EE5derefEv (this=0x7f402e82d080) at DerivedSources/ForwardingHeaders/wtf/ThreadSafeRefCounted.h:76 #6 0x00007f40a7522f98 in _ZN3WTF14derefIfNotNullIN7WebCore27PlatformMediaResourceLoaderEEEvPT_ (ptr=0x7f402e82d078) at DerivedSources/ForwardingHeaders/wtf/RefPtr.h:44 #7 0x00007f40a7521fd1 in _ZN3WTF6RefPtrIN7WebCore27PlatformMediaResourceLoaderENS_13DumbPtrTraitsIS2_EEED2Ev (this=0x7f3fb0004ff8, __in_chrg=<optimized out>) at DerivedSources/ForwardingHeaders/wtf/RefPtr.h:69 #8 0x00007f40a7521d60 in _ZN20_WebKitWebSrcPrivateD2Ev (this=0x7f3fb0004fc0, __in_chrg=<optimized out>) at ../../Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:79 #9 0x00007f40a751a4c7 in webKitWebSrcFinalize (object=0x7f3fb0005160) at ../../Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:260 #10 0x00007f40948b3b62 in g_object_unref () at ../../Source/glib-2.58.1/gobject/gobject.c:3346 #11 g_object_unref () at ../../Source/glib-2.58.1/gobject/gobject.c:3238 #12 0x00007f40955bb806 in gst_bin_remove_func () at ../../Source/gstreamer-1.16.0/gst/gstbin.c:1809 #13 0x00007f40955ba8f8 in gst_bin_remove () at ../../Source/gstreamer-1.16.0/gst/gstbin.c:1871 #14 0x00007f40955bab83 in gst_bin_dispose () at ../../Source/gstreamer-1.16.0/gst/gstbin.c:527 #15 0x00007f40948b3af3 in g_object_unref () at ../../Source/glib-2.58.1/gobject/gobject.c:3309 #16 g_object_unref () at ../../Source/glib-2.58.1/gobject/gobject.c:3238 #17 0x00007f40955bb806 in gst_bin_remove_func () at ../../Source/gstreamer-1.16.0/gst/gstbin.c:1809 #18 0x00007f40955ba8f8 in gst_bin_remove () at ../../Source/gstreamer-1.16.0/gst/gstbin.c:1871 #19 0x00007f402dd456a4 in gst_adaptive_demux_stream_download_loop () at ../../Source/gst-plugins-bad-1.16.0/gst-libs/gst/adaptivedemux/gstadaptivedemux.c:3968 #20 0x00007f409562d9f1 in gst_task_func () at ../../Source/gstreamer-1.16.0/gst/gsttask.c:328 #21 0x00007f40947f5993 in g_thread_pool_thread_proxy () at ../../Source/glib-2.58.1/glib/gthreadpool.c:307 #22 0x00007f40947f5035 in g_thread_proxy () at ../../Source/glib-2.58.1/glib/gthread.c:784 #23 0x00007f4094feffa3 in start_thread (arg=<optimized out>) at pthread_create.c:486 #24 0x00007f40938d482f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 STDERR: ASSERTION FAILED: m_scriptExecutionContext->isContextThread() STDERR: ../../Source/WebCore/dom/ContextDestructionObserver.cpp(48) : void WebCore::ContextDestructionObserver::observeContext(WebCore::ScriptExecutionContext*) STDERR: 1 0x7f409b09d949 /home/phil/WebKit/WebKitBuild/Debug/lib/libjavascriptcoregtk-4.0.so.18(WTFCrash+0x9) [0x7f409b09d949] STDERR: 2 0x7f40a8893f3d /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WebCore::ContextDestructionObserver::observeContext(WebCore::ScriptExecutionContext*)+0x67) [0x7f40a8893f3d] STDERR: 3 0x7f40a8893ea7 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WebCore::ContextDestructionObserver::~ContextDestructionObserver()+0x2f) [0x7f40a8893ea7] STDERR: 4 0x7f40a8f5c754 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WebCore::MediaResourceLoader::~MediaResourceLoader()+0xcc) [0x7f40a8f5c754] STDERR: 5 0x7f40a8f5c794 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WebCore::MediaResourceLoader::~MediaResourceLoader()+0x18) [0x7f40a8f5c794] STDERR: 6 0x7f40a75238ef /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WTF::ThreadSafeRefCounted<WebCore::PlatformMediaResourceLoader, (WTF::DestructionThread)0>::deref() const+0x4b) [0x7f40a75238ef] STDERR: 7 0x7f40a7522f98 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(void WTF::derefIfNotNull<WebCore::PlatformMediaResourceLoader>(WebCore::PlatformMediaResourceLoader*)+0x2c) [0x7f40a7522f98] STDERR: 8 0x7f40a7521fd1 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(WTF::RefPtr<WebCore::PlatformMediaResourceLoader, WTF::DumbPtrTraits<WebCore::PlatformMediaResourceLoader> >::~RefPtr()+0x2f) [0x7f40a7521fd1] STDERR: 9 0x7f40a7521d60 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(_WebKitWebSrcPrivate::~_WebKitWebSrcPrivate()+0x72) [0x7f40a7521d60] STDERR: 10 0x7f40a751a4c7 /home/phil/WebKit/WebKitBuild/Debug/lib/libwebkit2gtk-4.0.so.37(+0xabfc4c7) [0x7f40a751a4c7] STDERR: 11 0x7f40948b3b62 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgobject-2.0.so.0(g_object_unref+0x1a2) [0x7f40948b3b62] STDERR: 12 0x7f40955bb806 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(+0x43806) [0x7f40955bb806] STDERR: 13 0x7f40955ba8f8 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(gst_bin_remove+0xf8) [0x7f40955ba8f8] STDERR: 14 0x7f40955bab83 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(+0x42b83) [0x7f40955bab83] STDERR: 15 0x7f40948b3af3 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgobject-2.0.so.0(g_object_unref+0x133) [0x7f40948b3af3] STDERR: 16 0x7f40955bb806 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(+0x43806) [0x7f40955bb806] STDERR: 17 0x7f40955ba8f8 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(gst_bin_remove+0xf8) [0x7f40955ba8f8] STDERR: 18 0x7f402dd456a4 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstadaptivedemux-1.0.so.0(+0x106a4) [0x7f402dd456a4] STDERR: 19 0x7f409562d9f1 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libgstreamer-1.0.so.0(+0xb59f1) [0x7f409562d9f1] STDERR: 20 0x7f40947f5993 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libglib-2.0.so.0(+0x74993) [0x7f40947f5993] STDERR: 21 0x7f40947f5035 /home/phil/WebKit/WebKitBuild/DependenciesGTK/Root/lib/libglib-2.0.so.0(+0x74035) [0x7f40947f5035] STDERR: 22 0x7f4094feffa3 /lib/x86_64-linux-gnu/libpthread.so.0(+0x7fa3) [0x7f4094feffa3] STDERR: 23 0x7f40938d482f /lib/x86_64-linux-gnu/libc.so.6(clone+0x3f) [0x7f40938d482f] 1529953 1 368120 pnormand 2019-04-24 05:07:31 -0700 Created attachment 368120 Patch 1529963 2 368120 calvaris 2019-04-24 05:57:20 -0700 Comment on attachment 368120 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368120&action=review > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:618 > + auto nullClient = std::make_unique<PlatformMediaResourceClient>(); > + priv->resource->setClient(WTFMove(nullClient)); why this pattern instead of the former? 1529968 3 pnormand 2019-04-24 07:37:58 -0700 Ah that was a change I had early in the branch to prevent another crash but with the finished patch I can't reproduce that specific crash. Will revert. 1529969 4 368123 pnormand 2019-04-24 07:39:21 -0700 Created attachment 368123 Patch 1530326 5 pnormand 2019-04-25 00:47:41 -0700 Committed r244640: <https://trac.webkit.org/changeset/244640> 1530327 6 webkit-bug-importer 2019-04-25 00:48:18 -0700 <rdar://problem/50197751> 368120 2019-04-24 05:07:31 -0700 2019-04-24 07:39:18 -0700 Patch bug-197230-20190424130729.patch text/plain 5588 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZhYmQ1MzliYzFlN2Jm NzQyNDYxMDk1YjJkYjllODc4ZDRiZjBhMy4uNGVkYzVlODA3Zjc0NTg5MGMwMDAyMTU3ZmRlZjcx MDY2MmE4YTQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA0LTI0ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbUkVHUkVTU0lP TihyMjQzMTk3KV1bR1N0cmVhbWVyXSBodHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qt d2Via2l0LW1lZGlhLXNlc3Npb24uaHRtbCBoaXRzIGFuIEFTU0VSVAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGVyZm9ybSB0aGUgcmVzb3VyY2UgbG9h ZGVyIGRpc3Bvc2FsIGFuZCBkZXN0cnVjdGlvbiBmcm9tIHRoZSBtYWluCisgICAgICAgIHRocmVh ZC4gQWxzbyBlbnN1cmUgdGhlcmUncyBubyBjaXJjdWxhciByZWZlcmVuY2UgYmV0d2VlbiB0aGUK KyAgICAgICAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQgYW5kIFdlYktpdFdlYlNyYyB3 aGVuIGRpc3Bvc2luZyBvZgorICAgICAgICB0aGUgcHJpdmF0ZSBXZWJLaXRXZWJTcmMgc3RvcmFn ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NYWluVGhyZWFkTm90 aWZpZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKF9XZWJLaXRXZWJTcmNQcml2YXRlOjp+X1dl YktpdFdlYlNyY1ByaXZhdGUpOgorICAgICAgICAod2Via2l0X3dlYl9zcmNfY2xhc3NfaW5pdCk6 CisgICAgICAgICh3ZWJLaXRXZWJTcmNEaXNwb3NlKToKKyAgICAgICAgKHdlYktpdFdlYlNyY0Ns b3NlU2Vzc2lvbik6CisgICAgICAgICh3ZWJLaXRXZWJTcmNGaW5hbGl6ZSk6IERlbGV0ZWQuCisK IDIwMTktMDQtMjQgIGNocmlzIGZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAg ICAgICBBWDogUmVtb3ZlIGRlcHJlY2F0ZWQgQWNjZXNzaWJpbGl0eSBPYmplY3QgTW9kZWwgZXZl bnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWFpblRocmVhZE5vdGlmaWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWFpblRocmVhZE5vdGlmaWVyLmgKaW5kZXggOTI1MTZjMjkyZjMwMWE3Njc5 ZjAzNWIyMThjM2EzZmQ2YzY5OWUzNS4uMzU0ODk4OTIxNmQ1NjVkOWJiYmRlMDg1MGMxOTBkYWQw OTQ5ZjExNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01haW5UaHJlYWROb3RpZmllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NYWluVGhyZWFkTm90aWZpZXIuaApAQCAtNDAsNiArNDAsOCBA QCBwdWJsaWM6CiAgICAgICAgIEFTU0VSVCghbV9pc1ZhbGlkLmxvYWQoKSk7CiAgICAgfQogCisg ICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9pc1ZhbGlkLmxvYWQoKTsgfQorCiAg ICAgdGVtcGxhdGU8dHlwZW5hbWUgRj4KICAgICB2b2lkIG5vdGlmeShUIG5vdGlmaWNhdGlvblR5 cGUsIEYmJiBjYWxsYmFja0Z1bmN0b3IpCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcAppbmRleCA0N2U3ZTIwMTYxY2ZiNjBlZGZkOGM1YWRlNmQ5MWJm Yzk3NGEyY2U2Li5hZTQxMjkzNjc1NmRkZjg1ZGE1YzdlMTU1YjQ4MWMzMWVhN2Q1Y2RjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNDYsNiArNDYs OCBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBIYXNoU2V0PFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0 eU9yaWdpbj4+JiBzZWN1cml0eU9yaWdpbnMoKSBjb25zdCB7IHJldHVybiBtX29yaWdpbnM7IH0K IAorICAgIHZvaWQgc2V0U291cmNlRWxlbWVudChXZWJLaXRXZWJTcmMqIHNyYykgeyBtX3NyYyA9 IEdTVF9FTEVNRU5UX0NBU1Qoc3JjKTsgfQorCiBwcml2YXRlOgogICAgIHZvaWQgY2hlY2tVcGRh dGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKTsKIApAQCAtNzMsMTAgKzc1LDMwIEBAIHBy aXZhdGU6CiBlbnVtIE1haW5UaHJlYWRTb3VyY2VOb3RpZmljYXRpb24gewogICAgIFN0YXJ0ID0g MSA8PCAwLAogICAgIFN0b3AgPSAxIDw8IDEsCisgICAgRGlzcG9zZSA9IDEgPDwgMiwKIH07CiAK ICNkZWZpbmUgV0VCS0lUX1dFQl9TUkNfR0VUX1BSSVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNF X0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQRV9XRUJfU1JDLCBXZWJLaXRXZWJTcmNQcml2 YXRlKSkKIHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7CisgICAgfl9XZWJLaXRXZWJTcmNQ cml2YXRlKCkKKyAgICB7CisgICAgICAgIGlmIChub3RpZmllciAmJiBub3RpZmllci0+aXNWYWxp ZCgpKSB7CisgICAgICAgICAgICBub3RpZmllci0+bm90aWZ5QW5kV2FpdChNYWluVGhyZWFkU291 cmNlTm90aWZpY2F0aW9uOjpEaXNwb3NlLCBbJl0geworICAgICAgICAgICAgICAgIGlmIChyZXNv dXJjZSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvKiBjbGllbnQgPSBzdGF0aWNfY2FzdDxD YWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudCo+KHJlc291cmNlLT5jbGllbnQoKSk7CisgICAg ICAgICAgICAgICAgICAgIGlmIChjbGllbnQpCisgICAgICAgICAgICAgICAgICAgICAgICBjbGll bnQtPnNldFNvdXJjZUVsZW1lbnQobnVsbHB0cik7CisKKyAgICAgICAgICAgICAgICAgICAgYXV0 byBudWxsQ2xpZW50ID0gc3RkOjptYWtlX3VuaXF1ZTxQbGF0Zm9ybU1lZGlhUmVzb3VyY2VDbGll bnQ+KCk7CisgICAgICAgICAgICAgICAgICAgIHJlc291cmNlLT5zZXRDbGllbnQoV1RGTW92ZShu dWxsQ2xpZW50KSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGxvYWRlciA9 IG51bGxwdHI7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIG5vdGlmaWVyLT5pbnZhbGlk YXRlKCk7CisgICAgICAgICAgICBub3RpZmllciA9IG51bGxwdHI7CisgICAgICAgIH0KKyAgICB9 CisKICAgICBDU3RyaW5nIG9yaWdpbmFsVVJJOwogICAgIENTdHJpbmcgcmVkaXJlY3RlZFVSSTsK ICAgICBib29sIGtlZXBBbGl2ZTsKQEAgLTEzMSw3ICsxNTMsNiBAQCBHU1RfREVCVUdfQ0FURUdP UllfU1RBVElDKHdlYmtpdF93ZWJfc3JjX2RlYnVnKTsKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNy Y1VyaUhhbmRsZXJJbml0KGdwb2ludGVyIGdJZmFjZSwgZ3BvaW50ZXIgaWZhY2VEYXRhKTsKIAog c3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRGlzcG9zZShHT2JqZWN0Kik7Ci1zdGF0aWMgdm9pZCB3 ZWJLaXRXZWJTcmNGaW5hbGl6ZShHT2JqZWN0Kik7CiBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNT ZXRQcm9wZXJ0eShHT2JqZWN0KiwgZ3VpbnQgcHJvcGVydHlJRCwgY29uc3QgR1ZhbHVlKiwgR1Bh cmFtU3BlYyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjR2V0UHJvcGVydHkoR09iamVjdCos IGd1aW50IHByb3BlcnR5SUQsIEdWYWx1ZSosIEdQYXJhbVNwZWMqKTsKIHN0YXRpYyBHc3RTdGF0 ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiwgR3N0U3Rh dGVDaGFuZ2UpOwpAQCAtMTU4LDcgKzE3OSw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc3Jj X2NsYXNzX2luaXQoV2ViS2l0V2ViU3JjQ2xhc3MqIGtsYXNzKQogICAgIEdPYmplY3RDbGFzcyog b2tsYXNzID0gR19PQkpFQ1RfQ0xBU1Moa2xhc3MpOwogCiAgICAgb2tsYXNzLT5kaXNwb3NlID0g d2ViS2l0V2ViU3JjRGlzcG9zZTsKLSAgICBva2xhc3MtPmZpbmFsaXplID0gd2ViS2l0V2ViU3Jj RmluYWxpemU7CiAgICAgb2tsYXNzLT5zZXRfcHJvcGVydHkgPSB3ZWJLaXRXZWJTcmNTZXRQcm9w ZXJ0eTsKICAgICBva2xhc3MtPmdldF9wcm9wZXJ0eSA9IHdlYktpdFdlYlNyY0dldFByb3BlcnR5 OwogCkBAIC0yNDMsMjMgKzI2MywxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19pbml0 KFdlYktpdFdlYlNyYyogc3JjKQogfQogCiBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNEaXNwb3Nl KEdPYmplY3QqIG9iamVjdCkKLXsKLSAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gV0VC S0lUX1dFQl9TUkMob2JqZWN0KS0+cHJpdjsKLSAgICBpZiAocHJpdi0+bm90aWZpZXIpIHsKLSAg ICAgICAgcHJpdi0+bm90aWZpZXItPmludmFsaWRhdGUoKTsKLSAgICAgICAgcHJpdi0+bm90aWZp ZXIgPSBudWxscHRyOwotICAgIH0KLQotICAgIEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFT UywgZGlzcG9zZSwgKG9iamVjdCkpOwotfQotCi1zdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNGaW5h bGl6ZShHT2JqZWN0KiBvYmplY3QpCiB7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9 IFdFQktJVF9XRUJfU1JDKG9iamVjdCktPnByaXY7CiAKICAgICBwcml2LT5+V2ViS2l0V2ViU3Jj UHJpdmF0ZSgpOwogCi0gICAgR1NUX0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6 ZSwgKG9iamVjdCkpOworICAgIEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgZGlzcG9z ZSwgKG9iamVjdCkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNTZXRQcm9wZXJ0eShH T2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFt U3BlYyogcHNwZWMpCkBAIC02MDUsNyArNjE0LDggQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3Jj Q2xvc2VTZXNzaW9uKFdlYktpdFdlYlNyYyogc3JjKQogCiAgICAgICAgIGlmIChwcml2LT5yZXNv dXJjZSkgewogICAgICAgICAgICAgcHJpdi0+cmVzb3VyY2UtPnN0b3AoKTsKLSAgICAgICAgICAg IHByaXYtPnJlc291cmNlLT5zZXRDbGllbnQobnVsbHB0cik7CisgICAgICAgICAgICBhdXRvIG51 bGxDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPFBsYXRmb3JtTWVkaWFSZXNvdXJjZUNsaWVudD4o KTsKKyAgICAgICAgICAgIHByaXYtPnJlc291cmNlLT5zZXRDbGllbnQoV1RGTW92ZShudWxsQ2xp ZW50KSk7CiAgICAgICAgICAgICBwcml2LT5yZXNvdXJjZSA9IG51bGxwdHI7CiAgICAgICAgIH0K IAo= 368123 2019-04-24 07:39:21 -0700 2019-04-24 14:28:05 -0700 Patch bug-197230-20190424153920.patch text/plain 5107 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhjYWNhNzRjODAwODMy ZDY4Y2Q4NjdmZmIwZDI0YTk0ZmJhZWRkOC4uNTkwYjNhZmJkNzc3MTI0YmM4NDE2NmNjNjQ2NjE5 YWRhMzBhZjE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA0LTI0ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbUkVHUkVTU0lP TihyMjQzMTk3KV1bR1N0cmVhbWVyXSBodHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qt d2Via2l0LW1lZGlhLXNlc3Npb24uaHRtbCBoaXRzIGFuIEFTU0VSVAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjMwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGVyZm9ybSB0aGUgcmVzb3VyY2UgbG9h ZGVyIGRpc3Bvc2FsIGFuZCBkZXN0cnVjdGlvbiBmcm9tIHRoZSBtYWluCisgICAgICAgIHRocmVh ZC4gQWxzbyBlbnN1cmUgdGhlcmUncyBubyBjaXJjdWxhciByZWZlcmVuY2UgYmV0d2VlbiB0aGUK KyAgICAgICAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQgYW5kIFdlYktpdFdlYlNyYyB3 aGVuIGRpc3Bvc2luZyBvZgorICAgICAgICB0aGUgcHJpdmF0ZSBXZWJLaXRXZWJTcmMgc3RvcmFn ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NYWluVGhyZWFkTm90 aWZpZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKF9XZWJLaXRXZWJTcmNQcml2YXRlOjp+X1dl YktpdFdlYlNyY1ByaXZhdGUpOgorICAgICAgICAod2Via2l0X3dlYl9zcmNfY2xhc3NfaW5pdCk6 CisgICAgICAgICh3ZWJLaXRXZWJTcmNEaXNwb3NlKToKKyAgICAgICAgKHdlYktpdFdlYlNyY0Ns b3NlU2Vzc2lvbik6CisgICAgICAgICh3ZWJLaXRXZWJTcmNGaW5hbGl6ZSk6IERlbGV0ZWQuCisK IDIwMTktMDQtMjQgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHU3RyZWFtZXJdIENyYXNoIGluIEF1ZGlvVHJhY2tQcml2YXRlIHdpdGggcGxheWJp bjMgZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01haW5UaHJlYWROb3RpZmllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01haW5UaHJlYWROb3RpZmllci5oCmluZGV4IDkyNTE2YzI5MmYz MDFhNzY3OWYwMzViMjE4YzNhM2ZkNmM2OTllMzUuLjM1NDg5ODkyMTZkNTY1ZDliYmJkZTA4NTBj MTkwZGFkMDk0OWYxMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NYWluVGhyZWFkTm90aWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWFpblRocmVhZE5vdGlmaWVyLmgKQEAgLTQwLDYg KzQwLDggQEAgcHVibGljOgogICAgICAgICBBU1NFUlQoIW1faXNWYWxpZC5sb2FkKCkpOwogICAg IH0KIAorICAgIGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNWYWxpZC5sb2FkKCk7 IH0KKwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEY+CiAgICAgdm9pZCBub3RpZnkoVCBub3RpZmlj YXRpb25UeXBlLCBGJiYgY2FsbGJhY2tGdW5jdG9yKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3Ry ZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dl YktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggNDdlN2UyMDE2MWNmYjYwZWRmZDhjNWFk ZTZkOTFiZmM5NzRhMmNlNi4uM2Y2YzJmMzZlMWFlYWVhOGZkY2U2OTI1NmRlYWJlYmY2NTAxNTJm ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTQ2 LDYgKzQ2LDggQEAgcHVibGljOgogCiAgICAgY29uc3QgSGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW4+PiYgc2VjdXJpdHlPcmlnaW5zKCkgY29uc3QgeyByZXR1cm4gbV9vcmln aW5zOyB9CiAKKyAgICB2b2lkIHNldFNvdXJjZUVsZW1lbnQoV2ViS2l0V2ViU3JjKiBzcmMpIHsg bV9zcmMgPSBHU1RfRUxFTUVOVF9DQVNUKHNyYyk7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIGNo ZWNrVXBkYXRlQmxvY2tzaXplKHVpbnQ2NF90IGJ5dGVzUmVhZCk7CiAKQEAgLTczLDEwICs3NSwy OSBAQCBwcml2YXRlOgogZW51bSBNYWluVGhyZWFkU291cmNlTm90aWZpY2F0aW9uIHsKICAgICBT dGFydCA9IDEgPDwgMCwKICAgICBTdG9wID0gMSA8PCAxLAorICAgIERpc3Bvc2UgPSAxIDw8IDIs CiB9OwogCiAjZGVmaW5lIFdFQktJVF9XRUJfU1JDX0dFVF9QUklWQVRFKG9iaikgKEdfVFlQRV9J TlNUQU5DRV9HRVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NSQywgV2ViS2l0V2Vi U3JjUHJpdmF0ZSkpCiBzdHJ1Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgeworICAgIH5fV2ViS2l0 V2ViU3JjUHJpdmF0ZSgpCisgICAgeworICAgICAgICBpZiAobm90aWZpZXIgJiYgbm90aWZpZXIt PmlzVmFsaWQoKSkgeworICAgICAgICAgICAgbm90aWZpZXItPm5vdGlmeUFuZFdhaXQoTWFpblRo cmVhZFNvdXJjZU5vdGlmaWNhdGlvbjo6RGlzcG9zZSwgWyZdIHsKKyAgICAgICAgICAgICAgICBp ZiAocmVzb3VyY2UpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byogY2xpZW50ID0gc3RhdGlj X2Nhc3Q8Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQqPihyZXNvdXJjZS0+Y2xpZW50KCkp OworICAgICAgICAgICAgICAgICAgICBpZiAoY2xpZW50KQorICAgICAgICAgICAgICAgICAgICAg ICAgY2xpZW50LT5zZXRTb3VyY2VFbGVtZW50KG51bGxwdHIpOworCisgICAgICAgICAgICAgICAg ICAgIHJlc291cmNlLT5zZXRDbGllbnQobnVsbHB0cik7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIGxvYWRlciA9IG51bGxwdHI7CisgICAgICAgICAgICB9KTsKKyAgICAgICAg ICAgIG5vdGlmaWVyLT5pbnZhbGlkYXRlKCk7CisgICAgICAgICAgICBub3RpZmllciA9IG51bGxw dHI7CisgICAgICAgIH0KKyAgICB9CisKICAgICBDU3RyaW5nIG9yaWdpbmFsVVJJOwogICAgIENT dHJpbmcgcmVkaXJlY3RlZFVSSTsKICAgICBib29sIGtlZXBBbGl2ZTsKQEAgLTEzMSw3ICsxNTIs NiBAQCBHU1RfREVCVUdfQ0FURUdPUllfU1RBVElDKHdlYmtpdF93ZWJfc3JjX2RlYnVnKTsKIHN0 YXRpYyB2b2lkIHdlYktpdFdlYlNyY1VyaUhhbmRsZXJJbml0KGdwb2ludGVyIGdJZmFjZSwgZ3Bv aW50ZXIgaWZhY2VEYXRhKTsKIAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRGlzcG9zZShHT2Jq ZWN0Kik7Ci1zdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNGaW5hbGl6ZShHT2JqZWN0Kik7CiBzdGF0 aWMgdm9pZCB3ZWJLaXRXZWJTcmNTZXRQcm9wZXJ0eShHT2JqZWN0KiwgZ3VpbnQgcHJvcGVydHlJ RCwgY29uc3QgR1ZhbHVlKiwgR1BhcmFtU3BlYyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3Jj R2V0UHJvcGVydHkoR09iamVjdCosIGd1aW50IHByb3BlcnR5SUQsIEdWYWx1ZSosIEdQYXJhbVNw ZWMqKTsKIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0 ZShHc3RFbGVtZW50KiwgR3N0U3RhdGVDaGFuZ2UpOwpAQCAtMTU4LDcgKzE3OCw2IEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfc3JjX2NsYXNzX2luaXQoV2ViS2l0V2ViU3JjQ2xhc3MqIGtsYXNz KQogICAgIEdPYmplY3RDbGFzcyogb2tsYXNzID0gR19PQkpFQ1RfQ0xBU1Moa2xhc3MpOwogCiAg ICAgb2tsYXNzLT5kaXNwb3NlID0gd2ViS2l0V2ViU3JjRGlzcG9zZTsKLSAgICBva2xhc3MtPmZp bmFsaXplID0gd2ViS2l0V2ViU3JjRmluYWxpemU7CiAgICAgb2tsYXNzLT5zZXRfcHJvcGVydHkg PSB3ZWJLaXRXZWJTcmNTZXRQcm9wZXJ0eTsKICAgICBva2xhc3MtPmdldF9wcm9wZXJ0eSA9IHdl YktpdFdlYlNyY0dldFByb3BlcnR5OwogCkBAIC0yNDMsMjMgKzI2MiwxMiBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfd2ViX3NyY19pbml0KFdlYktpdFdlYlNyYyogc3JjKQogfQogCiBzdGF0aWMgdm9p ZCB3ZWJLaXRXZWJTcmNEaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKLXsKLSAgICBXZWJLaXRXZWJT cmNQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9TUkMob2JqZWN0KS0+cHJpdjsKLSAgICBpZiAo cHJpdi0+bm90aWZpZXIpIHsKLSAgICAgICAgcHJpdi0+bm90aWZpZXItPmludmFsaWRhdGUoKTsK LSAgICAgICAgcHJpdi0+bm90aWZpZXIgPSBudWxscHRyOwotICAgIH0KLQotICAgIEdTVF9DQUxM X1BBUkVOVChHX09CSkVDVF9DTEFTUywgZGlzcG9zZSwgKG9iamVjdCkpOwotfQotCi1zdGF0aWMg dm9pZCB3ZWJLaXRXZWJTcmNGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCiB7CiAgICAgV2ViS2l0 V2ViU3JjUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfU1JDKG9iamVjdCktPnByaXY7CiAKICAg ICBwcml2LT5+V2ViS2l0V2ViU3JjUHJpdmF0ZSgpOwogCi0gICAgR1NUX0NBTExfUEFSRU5UKEdf T0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwgKG9iamVjdCkpOworICAgIEdTVF9DQUxMX1BBUkVOVChH X09CSkVDVF9DTEFTUywgZGlzcG9zZSwgKG9iamVjdCkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJL aXRXZWJTcmNTZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwgY29uc3Qg R1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcHNwZWMpCg==