generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: don't overwrite existing indexes.

Browse Source 
Prevents all kind of badness if files contain multiple
indexes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 4f7c7624c0db185c48c59d95d745ab3f7851a5b4)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Ronald S. Bultje 2012-03-28 12:56:07 -07:00 committed by Reinhard Tartler
parent 46f8bbfc6d
commit a08cb950b2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/mov.c
View File

@ -1699,6 +1699,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
unsigned int stps_index = 0; unsigned int stps_index = 0;
unsigned int i, j; unsigned int i, j;
uint64_t stream_size = 0; uint64_t stream_size = 0;
AVIndexEntry *mem;
/* adjust first dts according to edit list */ /* adjust first dts according to edit list */
if (sc->time_offset && mov->time_scale > 0) { if (sc->time_offset && mov->time_scale > 0) {
@ -1727,12 +1728,13 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
if (!sc->sample_count) if (!sc->sample_count)
return; return;
if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries)) if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries)
return; return;
st->index_entries = av_malloc(sc->sample_count*sizeof(*st->index_entries)); mem = av_realloc(st->index_entries, (st->nb_index_entries + sc->sample_count) * sizeof(*st->index_entries));
if (!st->index_entries) if (!mem)
return; return;
st->index_entries_allocated_size = sc->sample_count*sizeof(*st->index_entries); st->index_entries = mem;
st->index_entries_allocated_size = (st->nb_index_entries + sc->sample_count) * sizeof(*st->index_entries);
for (i = 0; i < sc->chunk_count; i++) { for (i = 0; i < sc->chunk_count; i++) {
current_offset = sc->chunk_offsets[i]; current_offset = sc->chunk_offsets[i];
@ -1815,12 +1817,13 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
av_dlog(mov->fc, "chunk count %d\n", total); av_dlog(mov->fc, "chunk count %d\n", total);
if (total >= UINT_MAX / sizeof(*st->index_entries)) if (total >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries)
return; return;
st->index_entries = av_malloc(total*sizeof(*st->index_entries)); mem = av_realloc(st->index_entries, (st->nb_index_entries + total) * sizeof(*st->index_entries));
if (!st->index_entries) if (!mem)
return; return;
st->index_entries_allocated_size = total*sizeof(*st->index_entries); st->index_entries = mem;
st->index_entries_allocated_size = (st->nb_index_entries + total) * sizeof(*st->index_entries);
// populate index // populate index
for (i = 0; i < sc->chunk_count; i++) { for (i = 0; i < sc->chunk_count; i++) {