diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-05 00:36:59 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-12-06 14:15:08 +0100 |
| commit | fde9b80c17e1f7ac7f8861d43180c94eaf8ee362 (patch) | |
| tree | a5641cb27c4201816406cb9407fb306e2056e83f | |
| parent | 32ba667dc7fd737dda5b2cec11eed6a01d8e5bc9 (diff) | |
| download | ffmpeg-fde9b80c17e1f7ac7f8861d43180c94eaf8ee362.tar.gz | |
avcodec/ffv1dec: Check for 0 quant tables
Fixes assertion failure
Fixes: 07ec1fc3c1cbf2d3edcd7d9b52ca156c/asan_heap-oob_13624c5_491_ecd4720a03e697ba750b235690656c8f.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5745cf799a4389bc5d14f2b4daf32fe4631c50bc)
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 48f68c3189..168a393874 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -533,7 +533,7 @@ static int read_extra_header(FFV1Context *f) } f->quant_table_count = get_symbol(c, state, 0); - if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES) + if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) return AVERROR_INVALIDDATA; for (i = 0; i < f->quant_table_count; i++) { |