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

mpegtsdemux: fix memory leaks

Browse Source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674393
This commit is contained in:
Gil Pedersen 2012-04-19 13:59:37 +02:00 committed by Wim Taymans
parent ad871224fc
commit 095a17ad03
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gst/mpegtsdemux/mpegtsbase.c
View File

@ -1311,12 +1311,12 @@ mpegts_base_sink_event (GstPad * pad, GstEvent * event)
break; break;
case GST_EVENT_EOS: case GST_EVENT_EOS:
res = gst_mpegts_base_handle_eos (base); res = gst_mpegts_base_handle_eos (base);
gst_event_unref (event);
break; break;
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
mpegts_packetizer_flush (base->packetizer); mpegts_packetizer_flush (base->packetizer);
mpegts_base_flush (base); mpegts_base_flush (base);
res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event); res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event);
gst_event_unref (event);
break; break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
@ -1324,7 +1324,6 @@ mpegts_base_sink_event (GstPad * pad, GstEvent * event)
/* Passthrough */ /* Passthrough */
default: default:
res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event); res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event);
gst_event_unref (event);
} }
gst_object_unref (base); gst_object_unref (base);
@ -1426,7 +1425,7 @@ static GstFlowReturn
mpegts_base_scan (MpegTSBase * base) mpegts_base_scan (MpegTSBase * base)
{ {
GstFlowReturn ret; GstFlowReturn ret;
GstBuffer *buf; GstBuffer *buf = NULL;
guint i; guint i;
gboolean done = FALSE; gboolean done = FALSE;
MpegTSPacketizerPacketReturn pret; MpegTSPacketizerPacketReturn pret;
@ -1447,6 +1446,7 @@ mpegts_base_scan (MpegTSBase * base)
/* Push to packetizer */ /* Push to packetizer */
mpegts_packetizer_push (base->packetizer, buf); mpegts_packetizer_push (base->packetizer, buf);
buf = NULL;
if (mpegts_packetizer_has_packets (base->packetizer)) { if (mpegts_packetizer_has_packets (base->packetizer)) {
if (base->seek_offset == -1) { if (base->seek_offset == -1) {
@ -1496,6 +1496,7 @@ mpegts_base_scan (MpegTSBase * base)
/* Push to packetizer */ /* Push to packetizer */
mpegts_packetizer_push (base->packetizer, buf); mpegts_packetizer_push (base->packetizer, buf);
buf = NULL;
if (mpegts_packetizer_has_packets (base->packetizer)) { if (mpegts_packetizer_has_packets (base->packetizer)) {
while (1) { while (1) {
@ -1545,7 +1546,7 @@ mpegts_base_loop (MpegTSBase * base)
break; break;
case BASE_MODE_STREAMING: case BASE_MODE_STREAMING:
{ {
GstBuffer *buf; GstBuffer *buf = NULL;
GST_DEBUG ("Pulling data from %" G_GUINT64_FORMAT, base->seek_offset); GST_DEBUG ("Pulling data from %" G_GUINT64_FORMAT, base->seek_offset);

3
gst/mpegtsdemux/mpegtsparse.c
View File

@ -251,6 +251,9 @@ push_event (MpegTSBase * base, GstEvent * event)
gst_pad_push_event (pad, event); gst_pad_push_event (pad, event);
} }
} }
gst_event_unref (event);
return TRUE; return TRUE;
} }

9
gst/mpegtsdemux/tsdemux.c
View File

@ -598,8 +598,10 @@ push_event (MpegTSBase * base, GstEvent * event)
GstTSDemux *demux = (GstTSDemux *) base; GstTSDemux *demux = (GstTSDemux *) base;
GList *tmp; GList *tmp;
if (G_UNLIKELY (demux->program == NULL)) if (G_UNLIKELY (demux->program == NULL)) {
gst_event_unref (event);
return FALSE; return FALSE;
}
for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) { for (tmp = demux->program->stream_list; tmp; tmp = tmp->next) {
TSDemuxStream *stream = (TSDemuxStream *) tmp->data; TSDemuxStream *stream = (TSDemuxStream *) tmp->data;
@ -609,6 +611,8 @@ push_event (MpegTSBase * base, GstEvent * event)
} }
} }
gst_event_unref (event);
return TRUE; return TRUE;
} }
@ -947,7 +951,8 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
if (name) if (name)
g_free (name); g_free (name);
if (template)
gst_object_unref (template);
if (caps) if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);