diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 21:29:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-16 23:37:25 +0100 |
| commit | be9ce6e10a8d53b8bc346c9337d75a5a30631a2a (patch) | |
| tree | 5adab478fa395ae026e1d1baf7fee2f54a84631e /libavformat | |
| parent | caa7a3914f499f74b3ee346f26d598ebdc0ec210 (diff) | |
| download | ffmpeg-be9ce6e10a8d53b8bc346c9337d75a5a30631a2a.tar.gz | |
avformat/mov: fix integer overflow of size
Fixes: case1_call_stack_overflow.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index be2728c79a..0282ac4d0d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1574,7 +1574,7 @@ static void mov_parse_stsd_audio(MOVContext *c, AVIOContext *pb, static void mov_parse_stsd_subtitle(MOVContext *c, AVIOContext *pb, AVStream *st, MOVStreamContext *sc, - int size) + int64_t size) { // ttxt stsd contains display flags, justification, background // color, fonts, and default styles, so fake an atom to read it @@ -1639,10 +1639,10 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st) static int mov_parse_stsd_data(MOVContext *c, AVIOContext *pb, AVStream *st, MOVStreamContext *sc, - int size) + int64_t size) { if (st->codec->codec_tag == MKTAG('t','m','c','d')) { - if (ff_get_extradata(st->codec, pb, size) < 0) + if ((int)size != size || ff_get_extradata(st->codec, pb, size) < 0) return AVERROR(ENOMEM); if (size > 16) { MOVStreamContext *tmcd_ctx = st->priv_data; |