diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-05-23 23:35:42 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-05-24 15:08:21 +0200 |
| commit | 8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0 (patch) | |
| tree | 6892678f40a1a528acbfe51dcd966cba916a688a /libavformat/mov.c | |
| parent | a5718863da99b54b6c853d45c84871c4a96a57c0 (diff) | |
| download | ffmpeg-8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0.tar.gz | |
mov: fix two memleaks
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index f6f07be554..ae4f2cdabf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2175,10 +2175,11 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->sample_count = i; + av_free(buf); + if (pb->eof_reached) return AVERROR_EOF; - av_free(buf); return 0; } @@ -2286,6 +2287,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; if (entries >= UINT_MAX / sizeof(*sc->ctts_data)) return AVERROR_INVALIDDATA; + av_freep(&sc->ctts_data); sc->ctts_data = av_malloc(entries * sizeof(*sc->ctts_data)); if (!sc->ctts_data) return AVERROR(ENOMEM); |