highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '577f1feb3fd1e51fd14af7ce6d79d468faa3b929' into release/2.4

Browse Source 
* commit '577f1feb3fd1e51fd14af7ce6d79d468faa3b929':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
	libavformat/mov.c

See: 1b5d112406
See: 5ab882d728
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-20 11:48:28 +01:00
parent 47e4a1ac6d 577f1feb3f
commit 36e6842aa6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mov.c
View File

@@ -1851,8 +1851,10 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
} }
if (sc->keyframes) if (sc->keyframes)
av_log(c->fc, AV_LOG_WARNING, "Duplicate STSS atom\n"); av_log(c->fc, AV_LOG_WARNING, "Duplicated STSS atom\n");
av_free(sc->keyframes); if (entries >= UINT_MAX / sizeof(int))
return AVERROR_INVALIDDATA;
av_freep(&sc->keyframes);
sc->keyframe_count = 0; sc->keyframe_count = 0;
sc->keyframes = av_malloc_array(entries, sizeof(*sc->keyframes)); sc->keyframes = av_malloc_array(entries, sizeof(*sc->keyframes));
if (!sc->keyframes) if (!sc->keyframes)