aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ffv1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-05 01:25:50 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-12-06 14:14:43 +0100
commit8a6a619cbeee99cb42207e01bd733422ece1d911 (patch)
treee9f71fcf9c4c2c1f427eeb5db99469c7c264e107 /libavcodec/ffv1dec.c
parent1aa1f4bbf45e258fb1fb0742d98ebef422fde094 (diff)
downloadffmpeg-8a6a619cbeee99cb42207e01bd733422ece1d911.tar.gz
avcodec/ffv1dec: Print an error if the quant table count is invalid
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a8b254e436dce2f5c8c6459108dab4b02cc6b79b)
Diffstat (limited to 'libavcodec/ffv1dec.c')
-rw-r--r--libavcodec/ffv1dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 22dcfddd28..60be4435d3 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -550,8 +550,10 @@ 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 || !f->quant_table_count)
+ if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) {
+ av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);
return AVERROR_INVALIDDATA;
+ }
for (i = 0; i < f->quant_table_count; i++) {
f->context_count[i] = read_quant_tables(c, f->quant_tables[i]);