Browse Source

avcodec/ffv1dec: Print an error if the quant table count is invalid

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a8b254e436)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.12
Michael Niedermayer 10 years ago
parent
commit
6c83283c3a
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/ffv1dec.c

+ 3
- 1
libavcodec/ffv1dec.c View File

@@ -567,8 +567,10 @@ static int read_extra_header(FFV1Context *f)
} }


f->quant_table_count = get_symbol(c, state, 0); 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; return AVERROR_INVALIDDATA;
}


for (i = 0; i < f->quant_table_count; i++) { for (i = 0; i < f->quant_table_count; i++) {
f->context_count[i] = read_quant_tables(c, f->quant_tables[i]); f->context_count[i] = read_quant_tables(c, f->quant_tables[i]);


Loading…
Cancel
Save