diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-26 13:09:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:49 +0100 |
| commit | ac19d8eb3ac797eb8826909c6f16f47df349e070 (patch) | |
| tree | 1c7851dca5861f80d5d71c0b06dcfafd5eb19e76 /libavcodec | |
| parent | b5b29b22c0f8b49db045edb33254291486cb0db7 (diff) | |
| download | ffmpeg-ac19d8eb3ac797eb8826909c6f16f47df349e070.tar.gz | |
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>
(cherry picked from commit 10bbf6cf622f8a954c6cc694ca07c24f989c99af)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1dec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 26ed2eeddc..475b1adf1f 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -503,7 +503,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; } |