mirror of https://git.ffmpeg.org/ffmpeg.git
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 1b5d112406
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
823a9177a3
commit
a736171b69
|
@ -1193,6 +1193,10 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
if (entries >= UINT_MAX/sizeof(int64_t))
|
if (entries >= UINT_MAX/sizeof(int64_t))
|
||||||
return AVERROR_INVALIDDATA;
|
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));
|
sc->chunk_offsets = av_malloc(entries * sizeof(int64_t));
|
||||||
if (!sc->chunk_offsets)
|
if (!sc->chunk_offsets)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
@ -1709,6 +1713,10 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
return 0;
|
return 0;
|
||||||
if (entries >= UINT_MAX / sizeof(*sc->stsc_data))
|
if (entries >= UINT_MAX / sizeof(*sc->stsc_data))
|
||||||
return AVERROR_INVALIDDATA;
|
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));
|
sc->stsc_data = av_malloc(entries * sizeof(*sc->stsc_data));
|
||||||
if (!sc->stsc_data)
|
if (!sc->stsc_data)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
|
Loading…
Reference in New Issue