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

Merge commit '93f919d0b4c4341ccee366c98ac9af813f8fe622' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-12-21 04:22:57 +01:00
parent 7a6907fcc3 93f919d0b4
commit 5e16809d49
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mov.c
View File

@@ -1690,6 +1690,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
if (entries >= UINT_MAX / sizeof(int)) if (entries >= UINT_MAX / sizeof(int))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_freep(&sc->keyframes);
sc->keyframes = av_malloc(entries * sizeof(int)); sc->keyframes = av_malloc(entries * sizeof(int));
if (!sc->keyframes) if (!sc->keyframes)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);