Title: [160312] trunk/Source/WebCore
- Revision
- 160312
- Author
- [email protected]
- Date
- 2013-12-09 08:18:45 -0800 (Mon, 09 Dec 2013)
Log Message
[GStreamer] Memory leak due to incorrect use of gst_tag_list_merge in TextCombinerGStreamer
https://bugs.webkit.org/show_bug.cgi?id=125452
Patch by Brendan Long <[email protected]> on 2013-12-09
Reviewed by Philippe Normand.
No new tests because this fixes a memory leak.
* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkitTextCombinerPadEvent): Use gst_tag_list_insert instead of gst_tag_list_merge, since we don't want to create a new list.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160311 => 160312)
--- trunk/Source/WebCore/ChangeLog 2013-12-09 14:17:27 UTC (rev 160311)
+++ trunk/Source/WebCore/ChangeLog 2013-12-09 16:18:45 UTC (rev 160312)
@@ -1,3 +1,15 @@
+2013-12-09 Brendan Long <[email protected]>
+
+ [GStreamer] Memory leak due to incorrect use of gst_tag_list_merge in TextCombinerGStreamer
+ https://bugs.webkit.org/show_bug.cgi?id=125452
+
+ Reviewed by Philippe Normand.
+
+ No new tests because this fixes a memory leak.
+
+ * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+ (webkitTextCombinerPadEvent): Use gst_tag_list_insert instead of gst_tag_list_merge, since we don't want to create a new list.
+
2013-12-09 Chris Fleizach <[email protected]>
AX: WebKit ignores @alt on IMG elements with role="text"
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (160311 => 160312)
--- trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2013-12-09 14:17:27 UTC (rev 160311)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2013-12-09 16:18:45 UTC (rev 160312)
@@ -202,7 +202,10 @@
gst_event_parse_tag(event, &tags);
ASSERT(tags);
- combinerPad->tags = gst_tag_list_merge(combinerPad->tags, tags, GST_TAG_MERGE_REPLACE);
+ if (!combinerPad->tags)
+ combinerPad->tags = gst_tag_list_copy(tags);
+ else
+ gst_tag_list_insert(combinerPad->tags, tags, GST_TAG_MERGE_REPLACE);
g_object_notify(G_OBJECT(pad), "tags");
break;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
