mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-31 10:45:08 +00:00
qtdemux: avoid XMP tag parsing fatal error.
qtdemux_handle_xmp_taglist() requires a writable taglist, but qtdemux->tag_list can become non-writable, specifically after sending global tags (qtdemux.c:958), which adds a second reference. Ensure the list is made writable before calling (make_writable will copy the list if necessary). https://bugzilla.gnome.org/show_bug.cgi?id=766177
This commit is contained in:
parent
5bb7ca8a62
commit
642331fd7f
|
@ -2781,6 +2781,9 @@ qtdemux_parse_uuid (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
|
||||||
taglist = gst_tag_list_from_xmp_buffer (buf);
|
taglist = gst_tag_list_from_xmp_buffer (buf);
|
||||||
gst_buffer_unref (buf);
|
gst_buffer_unref (buf);
|
||||||
|
|
||||||
|
/* make sure we have a usable taglist */
|
||||||
|
qtdemux->tag_list = gst_tag_list_make_writable (qtdemux->tag_list);
|
||||||
|
|
||||||
qtdemux_handle_xmp_taglist (qtdemux, qtdemux->tag_list, taglist);
|
qtdemux_handle_xmp_taglist (qtdemux, qtdemux->tag_list, taglist);
|
||||||
|
|
||||||
} else if (memcmp (buffer + offset, playready_uuid, 16) == 0) {
|
} else if (memcmp (buffer + offset, playready_uuid, 16) == 0) {
|
||||||
|
@ -11505,6 +11508,8 @@ gst_qtdemux_guess_bitrate (GstQTDemux * qtdemux)
|
||||||
|
|
||||||
if (!stream->stream_tags)
|
if (!stream->stream_tags)
|
||||||
stream->stream_tags = gst_tag_list_new_empty ();
|
stream->stream_tags = gst_tag_list_new_empty ();
|
||||||
|
else
|
||||||
|
stream->stream_tags = gst_tag_list_make_writable (stream->stream_tags);
|
||||||
|
|
||||||
gst_tag_list_add (stream->stream_tags, GST_TAG_MERGE_REPLACE,
|
gst_tag_list_add (stream->stream_tags, GST_TAG_MERGE_REPLACE,
|
||||||
GST_TAG_BITRATE, bitrate, NULL);
|
GST_TAG_BITRATE, bitrate, NULL);
|
||||||
|
|
Loading…
Reference in a new issue