projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f38d4b
)
mov: Fix two memleaks
author
Andreas Cadhalpun
<Andreas.Cadhalpun@googlemail.com>
Tue, 26 May 2015 13:24:36 +0000
(14:24 +0100)
committer
Luca Barbato
<lu_zero@gentoo.org>
Sun, 31 May 2015 11:05:12 +0000
(13:05 +0200)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
libavformat/mov.c
patch
|
blob
|
blame
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
70fa1e0
..
33e1054
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1942,10
+1942,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;
}
@@
-2028,6
+2029,8
@@
static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c->fc, AV_LOG_TRACE, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
+ av_freep(&sc->ctts_data);
+
if (!entries)
return 0;
if (entries >= UINT_MAX / sizeof(*sc->ctts_data))