118473 2013-07-08 09:09:53 -0700 [GTK] Leak: GstElement* leaking in MediaPlayerPrivateGStreamer::createAudioSink() 2013-07-16 13:18:09 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 116317 0 brian.holt webkit-unassigned cdumez cgarcia commit-queue eric.carlson glenn gustavo jer.noble kbalazs menard mrobinson pnormand oldest_to_newest 906825 0 brian.holt 2013-07-08 09:09:53 -0700 In Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: Leaks found using the "--leak" option in the Gtk port: Command: /home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/Programs/DumpRenderTree - Leak_StillReachable 3,328 bytes in 13 blocks are still reachable in loss record 939 of 1,061 realloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) g_realloc (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/gmem.c:224) g_array_maybe_expand (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/garray.c:785) g_array_append_vals (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/garray.c:423) gst_structure_id_set_value (/WebKitBuild/Dependencies/Source/gstreamer/gst/gststructure.c:476) gst_element_class_set_static_metadata (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelement.c:1345) gst_audio_convert_class_intern_init (/WebKitBuild/Dependencies/Source/gst-plugins-base/gst/audioconvert/gstaudioconvert.c:204) g_type_class_ref (/WebKitBuild/Dependencies/Source/glib-2.36.0/gobject/gtype.c:2239) g_object_newv (/WebKitBuild/Dependencies/Source/glib-2.36.0/gobject/gobject.c:1624) gst_element_factory_create (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:377) gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin() (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::MediaPlayerPrivateGStreamer::load(WTF::String const&) [clone .part.24] (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::MediaPlayer::loadWithNextMediaEngine(WebCore::MediaPlayerFactory*) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::MediaPlayer::load(WebCore::KURL const&, WebCore::ContentType const&, WTF::String const&) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::HTMLMediaElement::loadResource(WebCore::KURL const&, WebCore::ContentType&, WTF::String const&) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::HTMLMediaElement::selectMediaResource() (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::HTMLMediaElement::loadTimerFired(WebCore::Timer<WebCore::HTMLMediaElement>*) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::ThreadTimers::sharedTimerFiredInternal() (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) WebCore::timeout_cb(void*) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/.libs/libwebkitgtk-3.0.so.0.19.1) g_timeout_dispatch (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/gmain.c:4413) g_main_context_dispatch (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/gmain.c:3054) g_main_context_iterate.isra.22 (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/gmain.c:3701) g_main_loop_run (/WebKitBuild/Dependencies/Source/glib-2.36.0/glib/gmain.c:3895) gtk_main (/WebKitBuild/Dependencies/Source/gtk+-3.6.0/gtk/gtkmain.c:1163) runTest(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/Programs/DumpRenderTree) runTestingServerLoop() (/home/likewise-open/SERILOCAL/brian.holt/Code/gnome3/WebKit/WebKitBuild/Release/Programs/DumpRenderTree) Suppression (error hash=#FDF24213CEA9E828#): For more info on using suppressions see http://dev.chromium.org/developers/tree-sheriffs/sheriff-details-chromium/memory-sheriff#TOC-Suppressing-memory-reports { <insert_a_suppression_name_here> Memcheck:Leak fun:realloc fun:g_realloc fun:g_array_maybe_expand fun:g_array_append_vals fun:gst_structure_id_set_value fun:gst_element_class_set_static_metadata fun:gst_audio_convert_class_intern_init fun:g_type_class_ref fun:g_object_newv fun:gst_element_factory_create fun:gst_element_factory_make fun:_ZN7WebCore27MediaPlayerPrivateGStreamer15createAudioSinkEv fun:_ZN7WebCore27MediaPlayerPrivateGStreamer16createGSTPlayBinEv fun:_ZN7WebCore27MediaPlayerPrivateGStreamer4loadERKN3WTF6StringE.part.24 fun:_ZN7WebCore11MediaPlayer23loadWithNextMediaEngineEPNS_18MediaPlayerFactoryE fun:_ZN7WebCore11MediaPlayer4loadERKNS_4KURLERKNS_11ContentTypeERKN3WTF6StringE fun:_ZN7WebCore16HTMLMediaElement12loadResourceERKNS_4KURLERNS_11ContentTypeERKN3WTF6StringE fun:_ZN7WebCore16HTMLMediaElement19selectMediaResourceEv fun:_ZN7WebCore16HTMLMediaElement14loadTimerFiredEPNS_5TimerIS0_EE fun:_ZN7WebCore12ThreadTimers24sharedTimerFiredInternalEv fun:_ZN7WebCoreL10timeout_cbEPv fun:g_timeout_dispatch } 906826 1 206249 brian.holt 2013-07-08 09:14:08 -0700 Created attachment 206249 Patch 906832 2 cgarcia 2013-07-08 09:29:20 -0700 I don't know much about gst, but I thought elements had a floating reference that is consumed when added to a container. 906833 3 cdumez 2013-07-08 09:31:40 -0700 (In reply to comment #2) > I don't know much about gst, but I thought elements had a floating reference that is consumed when added to a container. Indeed, and the proof of that is that you don't actually "adopt". So which one(s) were actually leaking? 906836 4 206249 cdumez 2013-07-08 09:34:24 -0700 Comment on attachment 206249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206249&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1578 > + GRefPtr<GstElement> audioSink = adoptGRef(gst_bin_new("audio-sink")); The doc says that gst_bin_new() returns a floating reference: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBin.html#gst-bin-new How come adopting doesn't assert here? template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr) { ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr))); return GRefPtr<GstElement>(ptr, GRefPtrAdopt); } 906846 5 206249 brian.holt 2013-07-08 09:52:49 -0700 Comment on attachment 206249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206249&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1578 >> + GRefPtr<GstElement> audioSink = adoptGRef(gst_bin_new("audio-sink")); > > The doc says that gst_bin_new() returns a floating reference: > http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBin.html#gst-bin-new > > How come adopting doesn't assert here? > template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr) > { > ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr))); > return GRefPtr<GstElement>(ptr, GRefPtrAdopt); > } Thanks very much for the link - I should have checked first whether gst_bin_new returns a floating reference. Regarding the ASSERT, I'm working with a release build so it's ifdef'ed out. 906848 6 206249 cdumez 2013-07-08 09:55:05 -0700 Comment on attachment 206249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206249&action=review >>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1578 >>> + GRefPtr<GstElement> audioSink = adoptGRef(gst_bin_new("audio-sink")); >> >> The doc says that gst_bin_new() returns a floating reference: >> http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBin.html#gst-bin-new >> >> How come adopting doesn't assert here? >> template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr) >> { >> ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr))); >> return GRefPtr<GstElement>(ptr, GRefPtrAdopt); >> } > > Thanks very much for the link - I should have checked first whether gst_bin_new returns a floating reference. > > Regarding the ASSERT, I'm working with a release build so it's ifdef'ed out. Sometimes to streamer doc is wrong about these things so it should be double checked. Also note that the behaviour is sometimes different between streamer 0.10 and gstreamer 1.0. It is important that you test with a debug build. 906851 7 brian.holt 2013-07-08 09:57:11 -0700 (In reply to comment #3) > (In reply to comment #2) > > I don't know much about gst, but I thought elements had a floating reference that is consumed when added to a container. > > Indeed, and the proof of that is that you don't actually "adopt". So which one(s) were actually leaking? I think all of them were leaking: gst_element_factory_make () returns a new GstElement or NULL if unable to create element. [transfer floating] 906852 8 brian.holt 2013-07-08 09:57:53 -0700 (In reply to comment #6) > (From update of attachment 206249 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206249&action=review > > >>> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1578 > >>> + GRefPtr<GstElement> audioSink = adoptGRef(gst_bin_new("audio-sink")); > >> > >> The doc says that gst_bin_new() returns a floating reference: > >> http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBin.html#gst-bin-new > >> > >> How come adopting doesn't assert here? > >> template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr) > >> { > >> ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr))); > >> return GRefPtr<GstElement>(ptr, GRefPtrAdopt); > >> } > > > > Thanks very much for the link - I should have checked first whether gst_bin_new returns a floating reference. > > > > Regarding the ASSERT, I'm working with a release build so it's ifdef'ed out. > > Sometimes to streamer doc is wrong about these things so it should be double checked. Also note that the behaviour is sometimes different between streamer 0.10 and gstreamer 1.0. > It is important that you test with a debug build. I definitely will in the future. Thanks for the helpful comments. 906853 9 cdumez 2013-07-08 10:01:20 -0700 (In reply to comment #7) > (In reply to comment #3) > > (In reply to comment #2) > > > I don't know much about gst, but I thought elements had a floating reference that is consumed when added to a container. > > > > Indeed, and the proof of that is that you don't actually "adopt". So which one(s) were actually leaking? > > I think all of them were leaking: gst_element_factory_make () returns a new GstElement or NULL if unable to create element. [transfer floating] gst_element_factory() returns a floating reference and get_bin_add_many() should take ownership of the returned values later on: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBin.html#gst-bin-add Therefore, I don't understand why it leaks. 906854 10 cgarcia 2013-07-08 10:01:49 -0700 (In reply to comment #7) > (In reply to comment #3) > > (In reply to comment #2) > > > I don't know much about gst, but I thought elements had a floating reference that is consumed when added to a container. > > > > Indeed, and the proof of that is that you don't actually "adopt". So which one(s) were actually leaking? > > I think all of them were leaking: gst_element_factory_make () returns a new GstElement or NULL if unable to create element. [transfer floating] a GstElement is a GInitiallyUnowned, so it's returning a new element with a floating reference. You only need to convert it into a normal ref (which is what GRefPtr is does) if it's not added to a container that consumes the floating ref. 907051 11 brian.holt 2013-07-09 02:37:10 -0700 Some more detail about the origins of the leaks from the debug build: Leak_StillReachable 40 bytes in 1 blocks are still reachable in loss record 335 of 1,176 malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1564) GstElement* scale = gst_element_factory_make("scaletempo", 0); Leak_StillReachable 554 bytes in 41 blocks are still reachable in loss record 855 of 1,176 malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1570) GstElement* convert = gst_element_factory_make("audioconvert", 0); Leak_StillReachable 576 bytes in 4 blocks are still reachable in loss record 836 of 1,139 realloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1571) GstElement* resample = gst_element_factory_make("audioresample", 0); Leak_StillReachable 304 bytes in 10 blocks are still reachable in loss record 750 of 1,176 malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1572) GstElement* sink = gst_element_factory_make("autoaudiosink", 0); Leak_StillReachable 120 bytes in 3 blocks are still reachable in loss record 525 of 1,139 malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1578) GstElement* audioSink = gst_bin_new("audio-sink"); Additionally there are leaks at Leak_StillReachable 3,928 bytes in 49 blocks are still reachable in loss record 1,016 of 1,138 calloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1599) m_playBin = gst_element_factory_make(gPlaybinName, "play"); Leak_StillReachable 3,104 bytes in 28 blocks are still reachable in loss record 1,008 of 1,139 calloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ... gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink(_GstElement*) (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:563) m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink"); 907053 12 kbalazs 2013-07-09 02:53:52 -0700 (In reply to comment #11) > Some more detail about the origins of the leaks from the debug build: > > Leak_StillReachable > 40 bytes in 1 blocks are still reachable in loss record 335 of 1,176 > malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) > ... > gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) > WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1564) > GstElement* scale = gst_element_factory_make("scaletempo", 0); > still-reachebles are not leaks, at least in WebKit sense. It's normal that there are unfreed heap objects at termination because WebKit is intentionally does not care about that (the idea is to terminate faster, the OS frees up the memory anyway). It means that for example singletons are usually created on the heap and never freed. We should be sure that the objects holding these pointers are actually destroyed. Only in that case can we say that these are real leaks. Given that in this case valgrind would rather report definitely-lost failures, I assume these are not leaks. 907058 13 brian.holt 2013-07-09 03:03:33 -0700 (In reply to comment #12) > (In reply to comment #11) > > Some more detail about the origins of the leaks from the debug build: > > > > Leak_StillReachable > > 40 bytes in 1 blocks are still reachable in loss record 335 of 1,176 > > malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) > > ... > > gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) > > WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1564) > > GstElement* scale = gst_element_factory_make("scaletempo", 0); > > > > still-reachebles are not leaks, at least in WebKit sense. > It's normal that there are unfreed heap objects at termination because WebKit is intentionally does not care about that (the idea is to terminate faster, the OS frees up the memory anyway). It means that for example singletons are usually created on the heap and never freed. > We should be sure that the objects holding these pointers are actually destroyed. Only in that case can we say that these are real leaks. Given that in this case valgrind would rather report definitely-lost failures, I assume these are not leaks. That's a fair point. I will restrict my efforts to Definitely-Lost in the meantime. Should I mark this as wontfix? 907059 14 kbalazs 2013-07-09 03:26:54 -0700 (In reply to comment #13) > (In reply to comment #12) > > (In reply to comment #11) > > > Some more detail about the origins of the leaks from the debug build: > > > > > > Leak_StillReachable > > > 40 bytes in 1 blocks are still reachable in loss record 335 of 1,176 > > > malloc (/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) > > > ... > > > gst_element_factory_make (/WebKitBuild/Dependencies/Source/gstreamer/gst/gstelementfactory.c:446) > > > WebCore::MediaPlayerPrivateGStreamer::createAudioSink() (/WebKitBuild/Debug/../../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1564) > > > GstElement* scale = gst_element_factory_make("scaletempo", 0); > > > > > > > still-reachebles are not leaks, at least in WebKit sense. > > It's normal that there are unfreed heap objects at termination because WebKit is intentionally does not care about that (the idea is to terminate faster, the OS frees up the memory anyway). It means that for example singletons are usually created on the heap and never freed. > > We should be sure that the objects holding these pointers are actually destroyed. Only in that case can we say that these are real leaks. Given that in this case valgrind would rather report definitely-lost failures, I assume these are not leaks. > > That's a fair point. I will restrict my efforts to Definitely-Lost in the meantime. > > Should I mark this as wontfix? I would rather mark it invalid. 206249 2013-07-08 09:14:08 -0700 2013-07-16 13:18:09 -0700 Patch bug-118473-20130708171209.patch text/plain 3376 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmI5ZGM5ODY2ZTBlYTMz Mzc4MmM3YWI1YzdhYjUwMDBlYzQ2ZmRmYy4uYmEzOTJlMTU4OWY3NmNhMGUxOTNlNmY2NjY5MDg5 MjIzYWIyYTI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTA4ICBCcmlh biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBMZWFrOiBH c3RFbGVtZW50KiBsZWFraW5nIGluIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4NDczCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgbWVtb3J5IGxl YWsgYnkgY29udmVydGluZyB0byBHUmVmUHRycy4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwOgorCiAyMDEzLTA3LTA4ICBLaWhvbmcgS3dvbiAgPGtpaG9u Zy5rd29uQHNhbXN1bmcuY29tPgogCiAgICAgICAgIHZpYnJhdGUgZnVuY3Rpb24gaGF2ZSB0byBy ZXR1cm4gYm9vbGVhbiB2YWx1ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKaW5kZXggYmQzNThlYjYzM2Q5NTJmNTJiMmQyNmQwYTk4YzljY2I5NDY3 YWEwNS4uMmE2YTU5MjUwZWU2NjQ3OGViZTU5MGVlNTIyYzJiODQxMmNlYzYyZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTE1NjEsMzMg KzE1NjEsMzIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUF1ZGlv U2luaygpCiAgICAgaWYgKCFtX3BsYXlCaW4pCiAgICAgICAgIHJldHVybjsKIAotICAgIEdzdEVs ZW1lbnQqIHNjYWxlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJzY2FsZXRlbXBvIiwgMCk7 CisgICAgR1JlZlB0cjxHc3RFbGVtZW50PiBzY2FsZSA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFr ZSgic2NhbGV0ZW1wbyIsIDApOwogICAgIGlmICghc2NhbGUpIHsKICAgICAgICAgR1NUX1dBUk5J TkcoIkZhaWxlZCB0byBjcmVhdGUgc2NhbGV0ZW1wbyIpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgR3N0RWxlbWVudCogY29udmVydCA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgi YXVkaW9jb252ZXJ0IiwgMCk7Ci0gICAgR3N0RWxlbWVudCogcmVzYW1wbGUgPSBnc3RfZWxlbWVu dF9mYWN0b3J5X21ha2UoImF1ZGlvcmVzYW1wbGUiLCAwKTsKLSAgICBHc3RFbGVtZW50KiBzaW5r ID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhdXRvYXVkaW9zaW5rIiwgMCk7CisgICAgR1Jl ZlB0cjxHc3RFbGVtZW50PiBjb252ZXJ0ID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhdWRp b2NvbnZlcnQiLCAwKTsKKyAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IHJlc2FtcGxlID0gZ3N0X2Vs ZW1lbnRfZmFjdG9yeV9tYWtlKCJhdWRpb3Jlc2FtcGxlIiwgMCk7CisgICAgR1JlZlB0cjxHc3RF bGVtZW50PiBzaW5rID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhdXRvYXVkaW9zaW5rIiwg MCk7CiAKICAgICBtX2F1dG9BdWRpb1NpbmsgPSBzaW5rOwogCi0gICAgZ19zaWduYWxfY29ubmVj dChzaW5rLCAiY2hpbGQtYWRkZWQiLCBHX0NBTExCQUNLKHNldEF1ZGlvU3RyZWFtUHJvcGVydGll c0NhbGxiYWNrKSwgdGhpcyk7CisgICAgZ19zaWduYWxfY29ubmVjdChzaW5rLmdldCgpLCAiY2hp bGQtYWRkZWQiLCBHX0NBTExCQUNLKHNldEF1ZGlvU3RyZWFtUHJvcGVydGllc0NhbGxiYWNrKSwg dGhpcyk7CiAKLSAgICBHc3RFbGVtZW50KiBhdWRpb1NpbmsgPSBnc3RfYmluX25ldygiYXVkaW8t c2luayIpOwotICAgIGdzdF9iaW5fYWRkX21hbnkoR1NUX0JJTihhdWRpb1NpbmspLCBzY2FsZSwg Y29udmVydCwgcmVzYW1wbGUsIHNpbmssIE5VTEwpOworICAgIEdSZWZQdHI8R3N0RWxlbWVudD4g YXVkaW9TaW5rID0gYWRvcHRHUmVmKGdzdF9iaW5fbmV3KCJhdWRpby1zaW5rIikpOworICAgIGdz dF9iaW5fYWRkX21hbnkoR1NUX0JJTihhdWRpb1NpbmsuZ2V0KCkpLCBzY2FsZS5nZXQoKSwgY29u dmVydC5nZXQoKSwgcmVzYW1wbGUuZ2V0KCksIHNpbmsuZ2V0KCksIE5VTEwpOwogCi0gICAgaWYg KCFnc3RfZWxlbWVudF9saW5rX21hbnkoc2NhbGUsIGNvbnZlcnQsIHJlc2FtcGxlLCBzaW5rLCBO VUxMKSkgeworICAgIGlmICghZ3N0X2VsZW1lbnRfbGlua19tYW55KHNjYWxlLmdldCgpLCBjb252 ZXJ0LmdldCgpLCByZXNhbXBsZS5nZXQoKSwgc2luay5nZXQoKSwgTlVMTCkpIHsKICAgICAgICAg R1NUX1dBUk5JTkcoIkZhaWxlZCB0byBsaW5rIGF1ZGlvIHNpbmsgZWxlbWVudHMiKTsKLSAgICAg ICAgZ3N0X29iamVjdF91bnJlZihhdWRpb1NpbmspOwogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgR1JlZlB0cjxHc3RQYWQ+IHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3Rh dGljX3BhZChzY2FsZSwgInNpbmsiKSk7Ci0gICAgZ3N0X2VsZW1lbnRfYWRkX3BhZChhdWRpb1Np bmssIGdzdF9naG9zdF9wYWRfbmV3KCJzaW5rIiwgcGFkLmdldCgpKSk7CisgICAgR1JlZlB0cjxH c3RQYWQ+IHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChzY2FsZS5n ZXQoKSwgInNpbmsiKSk7CisgICAgZ3N0X2VsZW1lbnRfYWRkX3BhZChhdWRpb1NpbmsuZ2V0KCks IGdzdF9naG9zdF9wYWRfbmV3KCJzaW5rIiwgcGFkLmdldCgpKSk7CiAKLSAgICBnX29iamVjdF9z ZXQobV9wbGF5QmluLmdldCgpLCAiYXVkaW8tc2luayIsIGF1ZGlvU2luaywgTlVMTCk7CisgICAg Z19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwgImF1ZGlvLXNpbmsiLCBhdWRpb1NpbmsuZ2V0 KCksIE5VTEwpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRl R1NUUGxheUJpbigpCg==