summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-02 02:37:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-02 02:37:36 +0200
commit9ebe6e391071690dbee79a645c51b14bd55c2ff4 (patch)
tree3c350c8a162d6442c3b3ddfc5f7b2a8a78aba269 /libavcodec/ffv1.c
parent97c281d5b7d1c4850a8ba7d9921137634224b2f3 (diff)
ffv1: fix integer overflow in quant table initialization
Fixes part of Ticket1372 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 79409e2a16..21f17611a1 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1651,9 +1651,9 @@ static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale){
memset(state, 128, sizeof(state));
for(v=0; i<128 ; v++){
- int len= get_symbol(c, state, 0) + 1;
+ unsigned len= get_symbol(c, state, 0) + 1;
- if(len + i > 128) return -1;
+ if(len > 128 - i) return -1;
while(len--){
quant_table[i] = scale*v;