Browse Source

avcodec/ffv1dec: Explicitly check read_quant_table() return value

Forwards the error code, avoids potential integer overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.0
Michael Niedermayer 10 years ago
parent
commit
10bbf6cf62
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavcodec/ffv1dec.c

+ 4
- 1
libavcodec/ffv1dec.c View File

@@ -502,7 +502,10 @@ static int read_quant_tables(RangeCoder *c,
int context_count = 1;

for (i = 0; i < 5; i++) {
context_count *= read_quant_table(c, quant_table[i], context_count);
int ret = read_quant_table(c, quant_table[i], context_count);
if (ret < 0)
return ret;
context_count *= ret;
if (context_count > 32768U) {
return AVERROR_INVALIDDATA;
}


Loading…
Cancel
Save