Title: [236733] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 236733
- Author
- ape...@igalia.com
- Date
- 2018-10-02 04:29:56 -0700 (Tue, 02 Oct 2018)
Log Message
Merge r236721 - [GStreamer][playbin3] Stream tag lists leaks
https://bugs.webkit.org/show_bug.cgi?id=190192
Reviewed by Xabier Rodriguez-Calvar.
The gst_stream_get_tags() result is transfer-full, so needs to be adopted to prevent a leak.
Also check the tags list pointer which might be NULL in some cases.
* platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
(WebCore::AudioTrackPrivateGStreamer::AudioTrackPrivateGStreamer):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::naturalSize const):
* platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
(WebCore::VideoTrackPrivateGStreamer::VideoTrackPrivateGStreamer):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (236732 => 236733)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-10-02 11:29:49 UTC (rev 236732)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-10-02 11:29:56 UTC (rev 236733)
@@ -1,3 +1,20 @@
+2018-10-02 Philippe Normand <pnorm...@igalia.com>
+
+ [GStreamer][playbin3] Stream tag lists leaks
+ https://bugs.webkit.org/show_bug.cgi?id=190192
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ The gst_stream_get_tags() result is transfer-full, so needs to be adopted to prevent a leak.
+ Also check the tags list pointer which might be NULL in some cases.
+
+ * platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:
+ (WebCore::AudioTrackPrivateGStreamer::AudioTrackPrivateGStreamer):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::naturalSize const):
+ * platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp:
+ (WebCore::VideoTrackPrivateGStreamer::VideoTrackPrivateGStreamer):
+
2018-10-01 Alicia Boya García <ab...@igalia.com>
[GStreamer] Fix abort in gst_sample_get_info()
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp (236732 => 236733)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2018-10-02 11:29:49 UTC (rev 236732)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp 2018-10-02 11:29:56 UTC (rev 236733)
@@ -49,9 +49,9 @@
, m_player(player)
{
gint kind;
- auto tags = gst_stream_get_tags(m_stream.get());
+ auto tags = adoptGRef(gst_stream_get_tags(m_stream.get()));
- if (gst_tag_list_get_int(tags, "webkit-media-stream-kind", &kind) && kind == static_cast<int>(VideoTrackPrivate::Kind::Main)) {
+ if (tags && gst_tag_list_get_int(tags.get(), "webkit-media-stream-kind", &kind) && kind == static_cast<int>(VideoTrackPrivate::Kind::Main)) {
GstStreamFlags streamFlags = gst_stream_get_stream_flags(stream.get());
gst_stream_set_stream_flags(stream.get(), static_cast<GstStreamFlags>(streamFlags | GST_STREAM_FLAG_SELECT));
}
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (236732 => 236733)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-10-02 11:29:49 UTC (rev 236732)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-10-02 11:29:56 UTC (rev 236733)
@@ -672,10 +672,10 @@
RefPtr<VideoTrackPrivateGStreamer> videoTrack = m_videoTracks.get(m_currentVideoStreamId);
if (videoTrack) {
- auto tags = gst_stream_get_tags(videoTrack->stream());
+ auto tags = adoptGRef(gst_stream_get_tags(videoTrack->stream()));
gint width, height;
- if (gst_tag_list_get_int(tags, WEBKIT_MEDIA_TRACK_TAG_WIDTH, &width) && gst_tag_list_get_int(tags, WEBKIT_MEDIA_TRACK_TAG_HEIGHT, &height))
+ if (tags && gst_tag_list_get_int(tags.get(), WEBKIT_MEDIA_TRACK_TAG_WIDTH, &width) && gst_tag_list_get_int(tags.get(), WEBKIT_MEDIA_TRACK_TAG_HEIGHT, &height))
return FloatSize(width, height);
}
}
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp (236732 => 236733)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2018-10-02 11:29:49 UTC (rev 236732)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.cpp 2018-10-02 11:29:56 UTC (rev 236733)
@@ -49,9 +49,9 @@
, m_player(player)
{
gint kind;
- auto tags = gst_stream_get_tags(m_stream.get());
+ auto tags = adoptGRef(gst_stream_get_tags(m_stream.get()));
- if (gst_tag_list_get_int(tags, "webkit-media-stream-kind", &kind) && kind == static_cast<int>(VideoTrackPrivate::Kind::Main)) {
+ if (tags && gst_tag_list_get_int(tags.get(), "webkit-media-stream-kind", &kind) && kind == static_cast<int>(VideoTrackPrivate::Kind::Main)) {
GstStreamFlags streamFlags = gst_stream_get_stream_flags(stream.get());
gst_stream_set_stream_flags(stream.get(), static_cast<GstStreamFlags>(streamFlags | GST_STREAM_FLAG_SELECT));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
