FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

avidemux: Avoid potential double-free

Browse Source 
stream->name was being freed (without being NULL-ed) before we were certain it
would be set again.

CID #1456071

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/582>
This commit is contained in:
Edward Hervey 2020-05-06 06:35:27 +02:00 committed by Edward Hervey
parent 518d192dc5
commit 619457ae26
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gst/avi/gstavidemux.c
View File

@ -2227,7 +2227,8 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
} }
break; break;
case GST_RIFF_TAG_strn: case GST_RIFF_TAG_strn:
g_free (stream->name); {
gchar *stream_name = NULL;
gst_buffer_map (sub, &map, GST_MAP_READ); gst_buffer_map (sub, &map, GST_MAP_READ);
@ -2237,12 +2238,16 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
map.data, map.size); map.data, map.size);
if (gst_tag_list_get_string (avi->globaltags, GST_TAG_TITLE, if (gst_tag_list_get_string (avi->globaltags, GST_TAG_TITLE,
&stream->name)) &stream_name)) {
GST_DEBUG_OBJECT (avi, "stream name: %s", stream->name); GST_DEBUG_OBJECT (avi, "stream name: %s", stream_name);
g_free (stream->name);
stream->name = stream_name;
}
gst_buffer_unmap (sub, &map); gst_buffer_unmap (sub, &map);
gst_buffer_unref (sub); gst_buffer_unref (sub);
sub = NULL; sub = NULL;
}
break; break;
case GST_RIFF_IDIT: case GST_RIFF_IDIT:
gst_avi_demux_parse_idit (avi, sub); gst_avi_demux_parse_idit (avi, sub);