summaryrefslogtreecommitdiff
path: root/libavcodec/vp5.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-11-17 10:06:14 -0800
committerAlex Converse <alex.converse@gmail.com>2011-11-17 11:58:49 -0800
commitbb4b0ad83b13c3af57675e80163f3f333adef96f (patch)
treeb3cbba94a71a4c6adde52d1589ad57f105b25ddd /libavcodec/vp5.c
parente0966eb140b3569b3d6b5b5008961944ef229c06 (diff)
vp5: Fix illegal read.
Found with Address Sanitizer
Diffstat (limited to 'libavcodec/vp5.c')
-rw-r--r--libavcodec/vp5.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index a1a38b0a03..56f667cb63 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -185,7 +185,8 @@ static void vp5_parse_coeff(VP56Context *s)
model1 = model->coeff_dccv[pt];
model2 = model->coeff_dcct[pt][ctx];
- for (coeff_idx=0; coeff_idx<64; ) {
+ coeff_idx = 0;
+ for (;;) {
if (vp56_rac_get_prob(c, model2[0])) {
if (vp56_rac_get_prob(c, model2[2])) {
if (vp56_rac_get_prob(c, model2[3])) {
@@ -222,8 +223,11 @@ static void vp5_parse_coeff(VP56Context *s)
ct = 0;
s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 0;
}
+ coeff_idx++;
+ if (coeff_idx >= 64)
+ break;
- cg = vp5_coeff_groups[++coeff_idx];
+ cg = vp5_coeff_groups[coeff_idx];
ctx = s->coeff_ctx[vp56_b6to4[b]][coeff_idx];
model1 = model->coeff_ract[pt][ct][cg];
model2 = cg > 2 ? model1 : model->coeff_acct[pt][ct][cg][ctx];