31352 2009-11-11 07:48:21 -0800 [GTK] Failing test media/video-document-types.html 2010-10-28 09:57:48 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 pnormand webkit-unassigned gustavo otte oldest_to_newest 162473 0 pnormand 2009-11-11 07:48:21 -0800 Since the fix of Bug 30221, that test is re-enabled but crashes on the Debug slaves. #0 0xf6c30b76 in WebCore::FrameLoader::addData (this=0x8440a7c, bytes=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebCore/loader/FrameLoader.cpp:1465 __PRETTY_FUNCTION__ = "void WebCore::FrameLoader::addData(const char*, int)" #1 0xf66e5aa9 in WebKit::FrameLoaderClient::committedLoad (this=0x8440988, loader=0x8441db0, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:151 encoding = {m_impl = {<WTF::FastAllocBase> = {<No data fields>}, m_ptr = 0x0}} userChosen = false frameLoader = 0x8440a7c __PRETTY_FUNCTION__ = "virtual void WebKit::FrameLoaderClient::committedLoad(WebCore::DocumentLoader*, const char*, int)" #2 0xf6c2b2a6 in WebCore::FrameLoader::committedLoad (this=0x8440a7c, loader=0x8441db0, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebCore/loader/FrameLoader.cpp:3209 No locals. #3 0xf6c17e5b in WebCore::DocumentLoader::commitLoad (this=0x8441db0, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebCore/loader/DocumentLoader.cpp:342 frameLoader = 0x8440a7c protect = {<WTF::FastAllocBase> = {<No data fields>}, m_ptr = 0x8441db0} #4 0xf6c17ec4 in WebCore::DocumentLoader::receivedData (this=0x8441db0, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebCore/loader/DocumentLoader.cpp:354 No locals. #5 0xf6c2d9b5 in WebCore::FrameLoader::receivedData (this=0x8440a7c, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192) at ../../WebCore/loader/FrameLoader.cpp:2061 No locals. #6 0xf6c4564a in WebCore::MainResourceLoader::addData (this=0x8447130, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192, allAtOnce=false) at ../../WebCore/loader/MainResourceLoader.cpp:143 No locals. #7 0xf6c5059b in WebCore::ResourceLoader::didReceiveData (this=0x8447130, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192, lengthReceived=16384, allAtOnce=false) at ../../WebCore/loader/ResourceLoader.cpp:248 protector = {<WTF::FastAllocBase> = {<No data fields>}, m_ptr = 0x8447130} #8 0xf6c44e18 in WebCore::MainResourceLoader::didReceiveData (this=0x8447130, data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192, lengthReceived=16384, allAtOnce=false) at ../../WebCore/loader/MainResourceLoader.cpp:374 protect = {<WTF::FastAllocBase> = {<No data fields>}, m_ptr = 0x8447130} __PRETTY_FUNCTION__ = "virtual void WebCore::MainResourceLoader::didReceiveData(const char*, int, long long int, bool)" #9 0xf6c4f8e0 in WebCore::ResourceLoader::didReceiveData (this=0x8447130, ---Type <return> to continue, or q <return> to quit--- data=0x8572c68 "\335\332\"\356\350#\325!:Ȣf#Q\223\1\32p+j@\36\3\320px\b\17D0\f\a\200\372\65\70C\36\373 \370\36\3\373\220x\b!\301\340 [", length=8192, lengthReceived=16384) at ../../WebCore/loader/ResourceLoader.cpp:398 No locals. #10 0xf70c97eb in readCallback (source=0x80a96f0, res=0x84098e0) at ../../WebCore/platform/network/soup/ResourceHandleSoup.cpp:736 handle = {<WTF::FastAllocBase> = {<No data fields>}, m_ptr = 0x8442a18} d = 0x8443678 client = 0x8447130 error = 0x0 bytesRead = 8192 #11 0xf4db65cf in async_ready_callback_wrapper (source_object=0x80a96f0, res=0x84098e0, user_data=0x0) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/gio/ginputstream.c:471 No locals. #12 0xf4dc4cd9 in IA__g_simple_async_result_complete (simple=0x84098e0) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/gio/gsimpleasyncresult.c:588 current_source = <value optimized out> current_context = 0x809b390 __PRETTY_FUNCTION__ = "IA__g_simple_async_result_complete" #13 0xf4dc500e in complete_in_idle_cb_for_thread (_data=0x80ee430) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/gio/gsimpleasyncresult.c:650 simple = 0x84098e0 #14 0xf4cb90b1 in g_idle_dispatch (source=0xf3300628, callback=0xbbadbeef, user_data=0x80ee430) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/glib/gmain.c:4065 No locals. #15 0xf4cbae98 in g_main_dispatch (context=0x809b390) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/glib/gmain.c:1960 __PRETTY_FUNCTION__ = "g_main_dispatch" #16 IA__g_main_context_dispatch (context=0x809b390) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/glib/gmain.c:2513 No locals. #17 0xf4cbe623 in g_main_context_iterate (context=0x809b390, block=1, dispatch=1, self=0x8076218) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/glib/gmain.c:2591 max_priority = 0 timeout = 0 some_ready = 1 nfds = 2 allocated_nfds = <value optimized out> fds = 0xf3300478 __PRETTY_FUNCTION__ = "g_main_context_iterate" #18 0xf4cbeaea in IA__g_main_loop_run (loop=0xf3300468) at /build/buildd-glib2.0_2.22.1-1-i386-tx7y62/glib2.0-2.22.1/glib/gmain.c:2799 self = 0x8076218 __PRETTY_FUNCTION__ = "IA__g_main_loop_run" #19 0xf50d8eb9 in gtk_main () from /usr/lib/libgtk-x11-2.0.so.0 No symbol table info available. #20 0x080567e8 in runTest (testPathOrURL=...) at ../../WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp:487 pathOrURL = {static npos = 4294967295, ---Type <return> to continue, or q <return> to quit--- _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0x80fdbdc "/tmp/LayoutTests/media/video-document-types.html"}} expectedPixelHash = {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0xf4b6073c ""}} separatorPos = 4294967295 url = 0x0 testURL = {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0x80fddfc "file:///tmp/LayoutTests/media/video-document-types.html"}} isSVGW3CTest = false size = {x = 0, y = 0, width = 800, height = 600} bfList = 0x8075d20 __PRETTY_FUNCTION__ = "void runTest(const std::string&)" #21 0x08056ce7 in main (argc=2, argv=0xffffd784) at ../../WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp:817 i = 1 options = {{name = 0x805cc6c "notree", has_arg = 0, flag = 0x805f740, val = 0}, {name = 0x805cc73 "pixel-tests", has_arg = 0, flag = 0x80608f4, val = 1}, {name = 0x805cc7f "tree", has_arg = 0, flag = 0x805f740, val = 1}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} option = -1 162474 1 42962 pnormand 2009-11-11 07:51:04 -0800 Created attachment 42962 Set document to parsing mode before parsing more data. 162843 2 42962 jmalonzo 2009-11-12 02:11:41 -0800 Comment on attachment 42962 Set document to parsing mode before parsing more data. > --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp > +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp > @@ -147,8 +147,11 @@ void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const cha > > FrameLoader* frameLoader = loader->frameLoader(); > frameLoader->setEncoding(encoding, userChosen); > - if (data) > + if (data) { > + frameLoader->frame()->document()->setParsing(true); > frameLoader->addData(data, length); > + frameLoader->frame()->document()->setParsing(false); Can you please expound more why we're doing this in the client interface? 162980 3 gustavo 2009-11-12 11:25:33 -0800 (In reply to comment #2) > > - if (data) > > + if (data) { > > + frameLoader->frame()->document()->setParsing(true); > > frameLoader->addData(data, length); > > + frameLoader->frame()->document()->setParsing(false); > > Can you please expound more why we're doing this in the client interface? This looks wrong. Mac and Win do not seem to do this. Hrm. 162988 4 42962 gustavo 2009-11-12 11:48:49 -0800 Comment on attachment 42962 Set document to parsing mode before parsing more data. > FrameLoader* frameLoader = loader->frameLoader(); > frameLoader->setEncoding(encoding, userChosen); > - if (data) > + if (data) { > + frameLoader->frame()->document()->setParsing(true); > frameLoader->addData(data, length); > + frameLoader->frame()->document()->setParsing(false); > + } > } This crash seems to be caused by the MediaDocument stopping parsing prematurely: bool MediaTokenizer::writeRawData(const char*, int) { ASSERT(!m_mediaElement); if (m_mediaElement) return false; createDocumentStructure(); finish(); return false; } [...] void MediaTokenizer::finish() { if (!m_parserStopped) m_doc->finishedParsing(); } I wonder why this is done like this. Maybe Mac and Win are delegating the loading of the video to something else? Anyway, since this is only a problem with Media documents, I think what the patch is doing is fairly certainly hiding a different issue, so r-. 162996 5 gustavo 2009-11-12 11:59:23 -0800 (In reply to comment #4) > I wonder why this is done like this. Maybe Mac and Win are delegating the > loading of the video to something else? Anyway, since this is only a problem > with Media documents, I think what the patch is doing is fairly certainly > hiding a different issue, so r-. http://trac.webkit.org/changeset/36001 ooook... here's what: mac is apparently letting a plugin handle the load, which is why it tells the loader to finish the parsing, and then it cancels the main load in platform-specific code; we should either cancel the load, or not call that finish() there. 163029 6 43093 gustavo 2009-11-12 13:22:46 -0800 Created attachment 43093 proposed fix ok, I found the problem; we need to cancel the main load, like mac does, and we do need to handle the "plugin will handle load" error specially, as we thought we probably should. 163285 7 pnormand 2009-11-13 05:23:08 -0800 Yes that new patch is much better than what I came up with ;) Thanks for investigating on this Gustavo 164531 8 43093 xan.lopez 2009-11-18 04:41:28 -0800 Comment on attachment 43093 proposed fix Makes sense. 164533 9 gustavo 2009-11-18 04:49:11 -0800 Thanks. Landed as r51104. 301127 10 gustavo 2010-10-28 09:56:25 -0700 *** Bug 30161 has been marked as a duplicate of this bug. *** 301129 11 gustavo 2010-10-28 09:57:48 -0700 *** Bug 30363 has been marked as a duplicate of this bug. *** 42962 2009-11-11 07:51:04 -0800 2009-11-12 13:22:46 -0800 Set document to parsing mode before parsing more data. Set-document-to-parsing-mode-before-parsing-more-d.patch text/plain 1811 pnormand RnJvbSA3MGUwMmJiNjZhZGJkN2I3ZjRkNTRkNDJkODhiMmU3MGMwZGI0NGE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDExIE5vdiAyMDA5IDE2OjUwOjIyICswMTAwClN1YmplY3Q6IFtQQVRDSF0g U2V0IGRvY3VtZW50IHRvIHBhcnNpbmcgbW9kZSBiZWZvcmUgcGFyc2luZyBtb3JlIGRhdGEuCgot LS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg ICAxMiArKysrKysrKysrKysKIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRHdGsuY3BwIHwgICAgNSArKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNzY4ZmJmMy4uOThjMDRhMiAxMDA2NDQKLS0tIGEv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNSBAQAorMjAwOS0xMS0xMSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dU S10gRmFpbGluZyB0ZXN0IG1lZGlhL3ZpZGVvLWRvY3VtZW50LXR5cGVzLmh0bWwKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMzUyCisKKyAgICAgICAg U2V0IGRvY3VtZW50IHRvIHBhcnNpbmcgbW9kZSBiZWZvcmUgcGFyc2luZyBtb3JlIGRhdGEuCisK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAg ICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50Ojpjb21taXR0ZWRMb2FkKToKKwogMjAwOS0x MS0xMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGY3NjcyOWQuLjkxMWM0ODMgMTAw NjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwCkBAIC0xNDcsOCArMTQ3LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmNvbW1pdHRl ZExvYWQoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29uc3QgY2hhCiAKICAgICAg ICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0gbG9hZGVyLT5mcmFtZUxvYWRlcigpOwogICAg ICAgICBmcmFtZUxvYWRlci0+c2V0RW5jb2RpbmcoZW5jb2RpbmcsIHVzZXJDaG9zZW4pOwotICAg ICAgICBpZiAoZGF0YSkKKyAgICAgICAgaWYgKGRhdGEpIHsKKyAgICAgICAgICAgIGZyYW1lTG9h ZGVyLT5mcmFtZSgpLT5kb2N1bWVudCgpLT5zZXRQYXJzaW5nKHRydWUpOwogICAgICAgICAgICAg ZnJhbWVMb2FkZXItPmFkZERhdGEoZGF0YSwgbGVuZ3RoKTsKKyAgICAgICAgICAgIGZyYW1lTG9h ZGVyLT5mcmFtZSgpLT5kb2N1bWVudCgpLT5zZXRQYXJzaW5nKGZhbHNlKTsKKyAgICAgICAgfQog ICAgIH0KIAogICAgIGlmIChtX3BsdWdpblZpZXcpIHsKLS0gCjEuNi4zLjM= 43093 2009-11-12 13:22:46 -0800 2009-11-18 04:41:28 -0800 proposed fix 0001-Cancel-main-load-if-we-are-turning-it-into-a-video-t.patch text/plain 2750 gustavo RnJvbSBjMTJhZTFlZDBhM2IwNGFjYzQ1NWUxOTc2ZmE0ODBjM2RlNWIxYmE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGd1c3Rhdm8ubm9yb25o YUBjb2xsYWJvcmEuY28udWs+CkRhdGU6IFRodSwgMTIgTm92IDIwMDkgMTk6MjA6MDIgLTAyMDAK U3ViamVjdDogW1BBVENIXSBDYW5jZWwgbWFpbiBsb2FkIGlmIHdlIGFyZSB0dXJuaW5nIGl0IGlu dG8gYSB2aWRlbyB0YWcKCi0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysrKysKIFdlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIHwgICAgOCArKysrKy0tLQogMiBmaWxl cyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNzkxYzM0 Mi4uMDdjZjQyMCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOS0xMS0xMiAgR3VzdGF2byBOb3Jv bmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBGYWlsaW5nIHRlc3Qg bWVkaWEvdmlkZW8tZG9jdW1lbnQtdHlwZXMuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzEzNTIKKworICAgICAgICBNYXRjaCB3aGF0IE1hYyBo YXMgYmVlbiBkb2luZyBzaW5jZSByMzYwMDE6IGNhbmNlbCB0aGUgbWFpbiBsb2FkLAorICAgICAg ICBhbmQgaGFuZGxlIGZhaWx1cmVzIGNhdXNlZCBieSAnd2lsbCBiZSBoYW5kbGVkIGJ5IHBsdWdp bicgZXJyb3JzLgorCisgICAgICAgIENvdmVyZWQgYnkgdGVzdCBtZWRpYS92aWRlby1kb2N1bWVu dC10eXBlcy5odG1sCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50Ojpjb21taXR0ZWRM b2FkKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OnNob3VsZEZhbGxCYWNr KToKKwogMjAwOS0xMS0xMSAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3Jvbmhh QGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIu CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwCmluZGV4IGY3NjcyOWQuLjhmM2EwMzYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC0xNDksNiArMTQ5LDEwIEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnQ6OmNvbW1pdHRlZExvYWQoV2ViQ29yZTo6RG9jdW1lbnRMb2Fk ZXIqIGxvYWRlciwgY29uc3QgY2hhCiAgICAgICAgIGZyYW1lTG9hZGVyLT5zZXRFbmNvZGluZyhl bmNvZGluZywgdXNlckNob3Nlbik7CiAgICAgICAgIGlmIChkYXRhKQogICAgICAgICAgICAgZnJh bWVMb2FkZXItPmFkZERhdGEoZGF0YSwgbGVuZ3RoKTsKKworICAgICAgICBGcmFtZSogY29yZUZy YW1lID0gbG9hZGVyLT5mcmFtZSgpOworICAgICAgICBpZiAoY29yZUZyYW1lLT5kb2N1bWVudCgp ICYmIGNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+aXNNZWRpYURvY3VtZW50KCkpCisgICAgICAgICAg ICBsb2FkZXItPmNhbmNlbE1haW5SZXNvdXJjZUxvYWQoZnJhbWVMb2FkZXItPmNsaWVudCgpLT5w bHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKGxvYWRlci0+cmVzcG9uc2UoKSkpOwogICAgIH0KIAog ICAgIGlmIChtX3BsdWdpblZpZXcpIHsKQEAgLTk4Myw5ICs5ODcsNyBAQCBSZXNvdXJjZUVycm9y IEZyYW1lTG9hZGVyQ2xpZW50OjpwbHVnaW5XaWxsSGFuZGxlTG9hZEVycm9yKGNvbnN0IFJlc291 cmNlUmVzcG9ucwogCiBib29sIEZyYW1lTG9hZGVyQ2xpZW50OjpzaG91bGRGYWxsQmFjayhjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKLSAgICAvLyBGSVhNRTogTWFjIGNoZWNrcyBmb3Ig V2ViS2l0RXJyb3JQbHVnSW5XaWxsSGFuZGxlTG9hZCBoZXJlIHRvIGF2b2lkCi0gICAgLy8gbG9h ZGluZyBwbHVnaW4gY29udGVudCB0d2ljZS4gRG8gd2UgbmVlZCBpdD8KLSAgICByZXR1cm4gIShl cnJvci5pc0NhbmNlbGxhdGlvbigpIHx8IGVycm9yLmVycm9yQ29kZSgpID09IFdFQktJVF9QT0xJ Q1lfRVJST1JfRlJBTUVfTE9BRF9JTlRFUlJVUFRFRF9CWV9QT0xJQ1lfQ0hBTkdFKTsKKyAgICBy ZXR1cm4gIShlcnJvci5pc0NhbmNlbGxhdGlvbigpIHx8IGVycm9yLmVycm9yQ29kZSgpID09IFdF QktJVF9QT0xJQ1lfRVJST1JfRlJBTUVfTE9BRF9JTlRFUlJVUFRFRF9CWV9QT0xJQ1lfQ0hBTkdF IHx8IGVycm9yLmVycm9yQ29kZSgpID09IFdFQktJVF9QTFVHSU5fRVJST1JfV0lMTF9IQU5ETEVf TE9BRCk7CiB9CiAKIGJvb2wgRnJhbWVMb2FkZXJDbGllbnQ6OmNhbkNhY2hlUGFnZSgpIGNvbnN0 Ci0tIAoxLjYuNS4yCgo=