diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-29 19:16:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:39:12 +0200 |
| commit | 9e9e6bbe7b79cf7bb628b7f32321b9509ecb3cba (patch) | |
| tree | 66fe528391a7631feffdaa813245b80df9c11867 | |
| parent | 3e4eea6c3255ccbb059db6d5998147597e9ceccd (diff) | |
| download | ffmpeg-9e9e6bbe7b79cf7bb628b7f32321b9509ecb3cba.tar.gz | |
4xm: fix division by zero caused by bps<8
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1b8741a6843f3f4667c81c2d63d3182858aa534f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/4xm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 90a5fa0cbb..c8eb0c0d1f 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -201,6 +201,11 @@ static int fourxm_read_header(AVFormatContext *s, ret= -1; goto fail; } + if(!fourxm->tracks[current_track].adpcm && fourxm->tracks[current_track].bits<8){ + av_log(s, AV_LOG_ERROR, "bits unspecified for non ADPCM\n"); + ret = AVERROR_INVALIDDATA; + goto fail; + } i += 8 + size; /* allocate a new AVStream */ |