Changeset 102791 in webkit

Timestamp:

Dec 14, 2011 9:26:08 AM (12 years ago)

Author:

Philippe Normand

Message:

[GStreamer] padTemplate leak in webkitwebaudiosrc
​https://bugs.webkit.org/show_bug.cgi?id=74495

Reviewed by Martin Robinson.

Use a GstPadTemplate smart pointer in webkit_web_audio_src_init to
avoid a memory leak after the ghost pad creation.

• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:

(webkit_web_audio_src_init):

• platform/graphics/gstreamer/GRefPtrGStreamer.cpp:

(WTF::adoptGRef):
(WTF::GstPadTemplate):

• platform/graphics/gstreamer/GRefPtrGStreamer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-14  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] padTemplate leak in webkitwebaudiosrc
+        https://bugs.webkit.org/show_bug.cgi?id=74495
+
+        Reviewed by Martin Robinson.
+
+        Use a GstPadTemplate smart pointer in webkit_web_audio_src_init to
+        avoid a memory leak after the ghost pad creation.
+
+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+        (webkit_web_audio_src_init):
+        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+        (WTF::adoptGRef):
+        (WTF::GstPadTemplate):
+        * platform/graphics/gstreamer/GRefPtrGStreamer.h:
+
 2011-12-14  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp

@@ -180 +180 @@
     new (priv) WebKitWebAudioSourcePrivate();
 
-    GstPadTemplate* padTemplate = gst_static_pad_template_get(&srcTemplate);
-    priv->sourcePad = gst_ghost_pad_new_no_target_from_template("src", padTemplate);
+    GRefPtr<GstPadTemplate> padTemplate = adoptGRef(gst_static_pad_template_get(&srcTemplate));
+    priv->sourcePad = gst_ghost_pad_new_no_target_from_template("src", padTemplate.get());
     gst_element_add_pad(GST_ELEMENT(src), priv->sourcePad);
 

trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp

@@ -69 +69 @@
 }
 
+template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
+{
+    ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+    return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
+}
+
+template <> GstPadTemplate* refGPtr<GstPadTemplate>(GstPadTemplate* ptr)
+{
+    if (ptr) {
+        gst_object_ref(GST_OBJECT(ptr));
+        gst_object_sink(GST_OBJECT(ptr));
+    }
+    return ptr;
+}
+
+template <> void derefGPtr<GstPadTemplate>(GstPadTemplate* ptr)
+{
+    if (ptr)
+        gst_object_unref(GST_OBJECT(ptr));
+}
+
 template <> GstCaps* refGPtr<GstCaps>(GstCaps* ptr)
 {

trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h

@@ -26 +26 @@
 typedef struct _GstElement GstElement;
 typedef struct _GstPad GstPad;
+typedef struct _GstPadTemplate GstPadTemplate;
 typedef struct _GstCaps GstCaps;
 typedef struct _GstTask GstTask;
@@ -39 +40 @@
 template<> void derefGPtr<GstPad>(GstPad* ptr);
 
+template<> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr);
+template<> GstPadTemplate* refGPtr<GstPadTemplate>(GstPadTemplate* ptr);
+template<> void derefGPtr<GstPadTemplate>(GstPadTemplate* ptr);
+
 template<> GstCaps* refGPtr<GstCaps>(GstCaps* ptr);
 template<> void derefGPtr<GstCaps>(GstCaps* ptr);