mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 13:25:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: fix index size check and debug message

Browse source 
It is allocating samples_count + n_samples, not only n_samples
This commit is contained in:
Thiago Santos 2015-07-07 16:46:33 -03:00
parent 4e23481d9f
commit 63f35eeb12
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/isomp4/qtdemux.c
View file

@ -2670,13 +2670,14 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
goto fail; goto fail;
data = (guint8 *) gst_byte_reader_peek_data_unchecked (trun); data = (guint8 *) gst_byte_reader_peek_data_unchecked (trun);
if (stream->n_samples >= if (stream->n_samples + samples_count >=
QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample)) QTDEMUX_MAX_SAMPLE_INDEX_SIZE / sizeof (QtDemuxSample))
goto index_too_big; goto index_too_big;
GST_DEBUG_OBJECT (qtdemux, "allocating n_samples %u * %u (%.2f MB)", GST_DEBUG_OBJECT (qtdemux, "allocating n_samples %u * %u (%.2f MB)",
stream->n_samples, (guint) sizeof (QtDemuxSample), stream->n_samples + samples_count, (guint) sizeof (QtDemuxSample),
stream->n_samples * sizeof (QtDemuxSample) / (1024.0 * 1024.0)); (stream->n_samples + samples_count) *
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)