diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:20:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:20:32 +0100 |
| commit | 522c7c37d23538183d94e960dcb9160441726124 (patch) | |
| tree | 302cec5ae717ec4a5c113c900f115047b508feec /libavformat | |
| parent | 525689ede90699df29aaa700fb45fd5659d4ce4e (diff) | |
| parent | 0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48 (diff) | |
| download | ffmpeg-522c7c37d23538183d94e960dcb9160441726124.tar.gz | |
Merge commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48' into release/0.10
* commit '0ceb2dffb6ba082a8abcc57c53a14b2512f0aa48':
mov: avoid a memleak when multiple stss boxes are present
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index dd26488aa2..5fbd6217ad 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1587,6 +1587,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; if (entries >= UINT_MAX / sizeof(int)) return AVERROR_INVALIDDATA; + av_freep(&sc->keyframes); sc->keyframes = av_malloc(entries * sizeof(int)); if (!sc->keyframes) return AVERROR(ENOMEM); |