Title: [226111] releases/WebKitGTK/webkit-2.18/Source/WebCore
Revision
226111
Author
[email protected]
Date
2017-12-19 00:07:01 -0800 (Tue, 19 Dec 2017)

Log Message

Merge r225459 - [GStreamer] GstPad leaked in WebKitTextCombiner
https://bugs.webkit.org/show_bug.cgi?id=180314

Reviewed by Michael Catanzaro.

gst_element_get_static_pad() returns a full reference that si never freed, because gst_ghost_pad_new doesn't
take the ownership of the given pad.

* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkit_text_combiner_init):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (226110 => 226111)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:06:56 UTC (rev 226110)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog	2017-12-19 08:07:01 UTC (rev 226111)
@@ -1,5 +1,18 @@
 2017-12-03  Carlos Garcia Campos  <[email protected]>
 
+        [GStreamer] GstPad leaked in WebKitTextCombiner
+        https://bugs.webkit.org/show_bug.cgi?id=180314
+
+        Reviewed by Michael Catanzaro.
+
+        gst_element_get_static_pad() returns a full reference that si never freed, because gst_ghost_pad_new doesn't
+        take the ownership of the given pad.
+
+        * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+        (webkit_text_combiner_init):
+
+2017-12-03  Carlos Garcia Campos  <[email protected]>
+
         [GStreamer] GstCaps leaked in MediaPlayerPrivateGStreamer::createGSTPlayBin
         https://bugs.webkit.org/show_bug.cgi?id=180311
 

Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (226110 => 226111)


--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:06:56 UTC (rev 226110)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp	2017-12-19 08:07:01 UTC (rev 226111)
@@ -24,9 +24,11 @@
  */
 
 #include "config.h"
+#include "TextCombinerGStreamer.h"
+
 #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
 
-#include "TextCombinerGStreamer.h"
+#include "GRefPtrGStreamer.h"
 
 static GstStaticPadTemplate sinkTemplate =
     GST_STATIC_PAD_TEMPLATE("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST,
@@ -83,10 +85,10 @@
     UNUSED_PARAM(ret);
     ASSERT(ret);
 
-    GstPad* pad = gst_element_get_static_pad(combiner->funnel, "src");
+    GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(combiner->funnel, "src"));
     ASSERT(pad);
 
-    ret = gst_element_add_pad(GST_ELEMENT(combiner), gst_ghost_pad_new("src", pad));
+    ret = gst_element_add_pad(GST_ELEMENT(combiner), gst_ghost_pad_new("src", pad.get()));
     ASSERT(ret);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to