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

qtdemux: Fix qtdemux memory leak in src_convert function

Browse source 
If we don't find the index of the sample correctly in src_convert function,
we have to unref about the qtdemux before returning value.
So, I have modify it about instead pass qtdemux as a parameter into
src_convert function.

https://bugzilla.gnome.org/show_bug.cgi?id=763973
This commit is contained in:
Jimmy Ohn 2016-03-24 15:14:23 +09:00 committed by Sebastian Dröge
parent c633f2aab7
commit 206e24855a
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/isomp4/qtdemux.c
View file

@ -718,12 +718,12 @@ gst_qtdemux_pull_atom (GstQTDemux * qtdemux, guint64 offset, guint64 size,
#if 1 #if 1
static gboolean static gboolean
gst_qtdemux_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value, gst_qtdemux_src_convert (GstQTDemux * qtdemux, GstPad * pad,
GstFormat dest_format, gint64 * dest_value) GstFormat src_format, gint64 src_value, GstFormat dest_format,
gint64 * dest_value)
{ {
gboolean res = TRUE; gboolean res = TRUE;
QtDemuxStream *stream = gst_pad_get_element_private (pad); QtDemuxStream *stream = gst_pad_get_element_private (pad);
GstQTDemux *qtdemux = GST_QTDEMUX (gst_pad_get_parent (pad));
gint32 index; gint32 index;
if (stream->subtype != FOURCC_vide) { if (stream->subtype != FOURCC_vide) {
@ -736,8 +736,10 @@ gst_qtdemux_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
switch (dest_format) { switch (dest_format) {
case GST_FORMAT_BYTES:{ case GST_FORMAT_BYTES:{
index = gst_qtdemux_find_index_linear (qtdemux, stream, src_value); index = gst_qtdemux_find_index_linear (qtdemux, stream, src_value);
if (-1 == index) if (-1 == index) {
return FALSE; res = FALSE;
goto done;
}
*dest_value = stream->samples[index].offset; *dest_value = stream->samples[index].offset;
@ -758,8 +760,10 @@ gst_qtdemux_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
gst_qtdemux_find_index_for_given_media_offset_linear (qtdemux, gst_qtdemux_find_index_for_given_media_offset_linear (qtdemux,
stream, src_value); stream, src_value);
if (-1 == index) if (-1 == index) {
return FALSE; res = FALSE;
goto done;
}
*dest_value = *dest_value =
QTSTREAMTIME_TO_GSTTIME (stream, QTSTREAMTIME_TO_GSTTIME (stream,
@ -776,11 +780,10 @@ gst_qtdemux_src_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
break; break;
default: default:
res = FALSE; res = FALSE;
break;
} }
done: done:
gst_object_unref (qtdemux);
return res; return res;
} }
#endif #endif
@ -848,7 +851,7 @@ gst_qtdemux_handle_src_query (GstPad * pad, GstObject * parent,
gst_query_parse_convert (query, &src_fmt, &src_value, &dest_fmt, NULL); gst_query_parse_convert (query, &src_fmt, &src_value, &dest_fmt, NULL);
res = gst_qtdemux_src_convert (pad, res = gst_qtdemux_src_convert (qtdemux, pad,
src_fmt, src_value, dest_fmt, &dest_value); src_fmt, src_value, dest_fmt, &dest_value);
if (res) { if (res) {
gst_query_set_convert (query, src_fmt, src_value, dest_fmt, dest_value); gst_query_set_convert (query, src_fmt, src_value, dest_fmt, dest_value);