diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-29 19:16:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 00:55:23 +0200 |
| commit | 56e987d2cd75f9e2ca77c08bb59449a11e58a53a (patch) | |
| tree | 4fcad9e7df6031e3b04fdaf5ffe6ed76f45716da | |
| parent | c64bfd7c3d231348b228d4d7260ffeee02995996 (diff) | |
| download | ffmpeg-56e987d2cd75f9e2ca77c08bb59449a11e58a53a.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 19ebffda1a..a794e88916 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -200,6 +200,11 @@ static int fourxm_read_header(AVFormatContext *s) ret = AVERROR_INVALIDDATA; 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 */ |