aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-05 00:36:59 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-05 01:31:52 +0100
commit5745cf799a4389bc5d14f2b4daf32fe4631c50bc (patch)
treee60c0053b8068f63648430a59d0b9bb2d422b4c5
parent9bec6d71a22ab42908f900f3b3289fa1edfcea6e (diff)
downloadffmpeg-5745cf799a4389bc5d14f2b4daf32fe4631c50bc.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>
-rw-r--r--libavcodec/ffv1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index d9e1e73fd6..367d8c7b95 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -569,7 +569,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++) {