mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

asfdemux: Fix memory leak of payload extensions for unusable/unsupported streams

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=775515
This commit is contained in:
Sebastian Dröge 2016-12-02 14:06:21 +02:00
parent c40b40b36f
commit 0ff3f79330
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/asfdemux/gstasfdemux.c
View file

@ -4081,6 +4081,8 @@ gst_asf_demux_process_ext_stream_props (GstASFDemux * demux, guint8 * data,
data_start = data; data_start = data;
obj_size = (guint) size; obj_size = (guint) size;
esp.payload_extensions = NULL;
if (size < 64) if (size < 64)
goto not_enough_data; goto not_enough_data;
@ -4133,8 +4135,6 @@ gst_asf_demux_process_ext_stream_props (GstASFDemux * demux, guint8 * data,
if (num_payload_ext > 0) if (num_payload_ext > 0)
esp.payload_extensions = g_new0 (AsfPayloadExtension, num_payload_ext + 1); esp.payload_extensions = g_new0 (AsfPayloadExtension, num_payload_ext + 1);
else
esp.payload_extensions = NULL;
for (i = 0; i < num_payload_ext; ++i) { for (i = 0; i < num_payload_ext; ++i) {
AsfPayloadExtension ext; AsfPayloadExtension ext;
@ -4236,12 +4236,16 @@ done:
GST_WARNING_OBJECT (demux, "Ext. stream properties for unknown stream"); GST_WARNING_OBJECT (demux, "Ext. stream properties for unknown stream");
} }
if (!stream)
g_free (esp.payload_extensions);
return GST_FLOW_OK; return GST_FLOW_OK;
/* Errors */ /* Errors */
not_enough_data: not_enough_data:
{ {
GST_WARNING_OBJECT (demux, "short read parsing ext stream props object!"); GST_WARNING_OBJECT (demux, "short read parsing ext stream props object!");
g_free (esp.payload_extensions);
return GST_FLOW_OK; /* not absolutely fatal */ return GST_FLOW_OK; /* not absolutely fatal */
} }
expected_stream_object: expected_stream_object:
@ -4249,11 +4253,13 @@ expected_stream_object:
GST_WARNING_OBJECT (demux, "error parsing extended stream properties " GST_WARNING_OBJECT (demux, "error parsing extended stream properties "
"object: expected embedded stream object, but got %s object instead!", "object: expected embedded stream object, but got %s object instead!",
gst_asf_get_guid_nick (asf_object_guids, stream_obj.id)); gst_asf_get_guid_nick (asf_object_guids, stream_obj.id));
g_free (esp.payload_extensions);
return GST_FLOW_OK; /* not absolutely fatal */ return GST_FLOW_OK; /* not absolutely fatal */
} }
corrupted_stream: corrupted_stream:
{ {
GST_WARNING_OBJECT (demux, "Corrupted stream"); GST_WARNING_OBJECT (demux, "Corrupted stream");
g_free (esp.payload_extensions);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
} }