mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: fix leak by flushing previous sample info from trak

Browse source 
In fragmented streaming, multiple moov/moof will be parsed and their
previously stored samples array might leak when new values are parsed.
The parse_trak and callees won't free the previously stored values
before parsing the new ones.

In step-by-step, this is what happens:

1) initial moov is parsed, traks as well, streams are created. The
   trak doesn't contain samples because they are in the moof's trun
   boxes. n_samples is set to 0 while parsing the trak and the samples
   array is still NULL.
2) moofs are parsed, and their trun boxes will increase n_samples and
   create/extend the samples array
3) At some point a new moov might be sent (bitrate switching, for example)
   and parsing the trak will overwrite n_samples with the values from
   this trak. If the n_samples is set to 0 qtdemux will assume that
   the samples array is NULL and will leak it when a new one is
   created for the subsequent moofs.

This patch makes qtdemux properly free previous sample data before
creating new ones and adds an assert to catch future occurrences of
this issue when the code changes.
This commit is contained in:
Thiago Santos 2015-07-07 21:31:08 -03:00
parent 63f35eeb12
commit 5994b30257
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/isomp4/qtdemux.c
View file

@ -2680,10 +2680,11 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
sizeof (QtDemuxSample) / (1024.0 * 1024.0)); sizeof (QtDemuxSample) / (1024.0 * 1024.0));
/* create a new array of samples if it's the first sample parsed */ /* create a new array of samples if it's the first sample parsed */
if (stream->n_samples == 0) if (stream->n_samples == 0) {
g_assert (stream->samples == NULL);
stream->samples = g_try_new0 (QtDemuxSample, samples_count); stream->samples = g_try_new0 (QtDemuxSample, samples_count);
/* or try to reallocate it with space enough to insert the new samples */ /* or try to reallocate it with space enough to insert the new samples */
else } else
stream->samples = g_try_renew (QtDemuxSample, stream->samples, stream->samples = g_try_renew (QtDemuxSample, stream->samples,
stream->n_samples + samples_count); stream->n_samples + samples_count);
if (stream->samples == NULL) if (stream->samples == NULL)
@ -6772,6 +6773,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
return FALSE; return FALSE;
} }
g_assert (stream->samples == NULL);
stream->samples = g_try_new0 (QtDemuxSample, stream->n_samples); stream->samples = g_try_new0 (QtDemuxSample, stream->n_samples);
if (!stream->samples) { if (!stream->samples) {
GST_WARNING_OBJECT (qtdemux, "failed to allocate %d samples", GST_WARNING_OBJECT (qtdemux, "failed to allocate %d samples",
@ -7817,6 +7819,9 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_WARNING_OBJECT (qtdemux, "Stream not found, going to ignore it"); GST_WARNING_OBJECT (qtdemux, "Stream not found, going to ignore it");
goto skip_track; goto skip_track;
} }
/* flush samples data from this track from previous moov */
gst_qtdemux_stream_flush_samples_data (qtdemux, stream);
} }
if (stream->pending_tags == NULL) if (stream->pending_tags == NULL)