aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-26 18:16:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-20 11:47:02 +0100
commita058cbcfdf490aab3aa12b45511c7315ed1bd35b (patch)
tree52b51254932f19ec42fa6b68ab852c70a323b8ca /libavformat
parent4afe2684d8f50b28ce6743c7ee999f3157c9857f (diff)
downloadffmpeg-a058cbcfdf490aab3aa12b45511c7315ed1bd35b.tar.gz
avformat/mov: Fix memleaks for duplicate STCO/CO64/STSC atoms
Also see [FFmpeg-devel] [PATCH] avformat/mov: strengthen some table allocations which contains more fixes but is unfinished Fixes: signal_sigabrt_7ffff6ac7bb9_3484_cov_1830000177_starfox2.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1b5d11240692025f036e945bc37968735679320a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7806ef564e..2ccb030bd4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1177,6 +1177,10 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (entries >= UINT_MAX/sizeof(int64_t))
return AVERROR_INVALIDDATA;
+ if (sc->chunk_offsets)
+ av_log(c->fc, AV_LOG_WARNING, "Duplicate STCO atom\n");
+ av_free(sc->chunk_offsets);
+ sc->chunk_count = 0;
sc->chunk_offsets = av_malloc(entries * sizeof(int64_t));
if (!sc->chunk_offsets)
return AVERROR(ENOMEM);
@@ -1768,6 +1772,10 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
if (entries >= UINT_MAX / sizeof(*sc->stsc_data))
return AVERROR_INVALIDDATA;
+ if (sc->stsc_data)
+ av_log(c->fc, AV_LOG_WARNING, "Duplicate STSC atom\n");
+ av_free(sc->stsc_data);
+ sc->stsc_count = 0;
sc->stsc_data = av_malloc(entries * sizeof(*sc->stsc_data));
if (!sc->stsc_data)
return AVERROR(ENOMEM);