diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:22:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:23:02 +0100 |
| commit | 5e16809d493c773573d081de17ec78fddd3ca043 (patch) | |
| tree | a32ed9bf95f3abfe43287f4dcbd27d586d288cd4 | |
| parent | 7a6907fcc33498e7b323f87e29c7e223304c1141 (diff) | |
| parent | 93f919d0b4c4341ccee366c98ac9af813f8fe622 (diff) | |
| download | ffmpeg-5e16809d493c773573d081de17ec78fddd3ca043.tar.gz | |
Merge commit '93f919d0b4c4341ccee366c98ac9af813f8fe622' into release/1.1
* commit '93f919d0b4c4341ccee366c98ac9af813f8fe622':
mov: avoid a memleak when multiple stss boxes are present
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 bab6d73586..888d2ac588 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1690,6 +1690,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom) } 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); |