generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/ffv1dec: Explicitly check read_quant_table() return value

Browse Source 
Forwards the error code, avoids potential integer overflow

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-09-26 13:09:59 +02:00
parent 9c0fb2548f
commit 54bc183897
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ffv1dec.c
View File

@@ -503,7 +503,10 @@ static int read_quant_tables(RangeCoder *c,
int context_count = 1; int context_count = 1;
for (i = 0; i < 5; i++) { 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) { if (context_count > 32768U) {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }