aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 03:12:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 18:03:50 +0100
commit07a9a43d5c1f6c4abcaba38d1e398aea6ad23802 (patch)
treed04b4c4e833ca0885eae8dd60ccc5ee747f49f40
parent7232fc75e14072784fe0c480cd68c4abeb8cc328 (diff)
downloadffmpeg-07a9a43d5c1f6c4abcaba38d1e398aea6ad23802.tar.gz
avcodec/snowdec: Fix ref value check
Fixes integer overflow and out of array read. Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f4cbf940212079a34753c7f4d6c6b5a43586d30) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/snowdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index dc5bea4ac6..5768160766 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -154,7 +154,7 @@ static int decode_q_branch(SnowContext *s, int level, int x, int y){
int l = left->color[0];
int cb= left->color[1];
int cr= left->color[2];
- int ref = 0;
+ unsigned ref = 0;
int ref_context= av_log2(2*left->ref) + av_log2(2*top->ref);
int mx_context= av_log2(2*FFABS(left->mx - top->mx)) + 0*av_log2(2*FFABS(tr->mx - top->mx));
int my_context= av_log2(2*FFABS(left->my - top->my)) + 0*av_log2(2*FFABS(tr->my - top->my));