Commit 2a6eb062 authored by Alex Converse's avatar Alex Converse

vp6: Fix illegal read.

parent 0d7a16a9
...@@ -376,7 +376,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s) ...@@ -376,7 +376,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s)
if (b > 3) pt = 1; if (b > 3) pt = 1;
vlc_coeff = &s->dccv_vlc[pt]; vlc_coeff = &s->dccv_vlc[pt];
for (coeff_idx=0; coeff_idx<64; ) { for (coeff_idx = 0;;) {
int run = 1; int run = 1;
if (coeff_idx<2 && s->nb_null[coeff_idx][pt]) { if (coeff_idx<2 && s->nb_null[coeff_idx][pt]) {
s->nb_null[coeff_idx][pt]--; s->nb_null[coeff_idx][pt]--;
...@@ -413,6 +413,8 @@ static void vp6_parse_coeff_huffman(VP56Context *s) ...@@ -413,6 +413,8 @@ static void vp6_parse_coeff_huffman(VP56Context *s)
} }
} }
coeff_idx+=run; coeff_idx+=run;
if (coeff_idx >= 64)
break;
cg = FFMIN(vp6_coeff_groups[coeff_idx], 3); cg = FFMIN(vp6_coeff_groups[coeff_idx], 3);
vlc_coeff = &s->ract_vlc[pt][ct][cg]; vlc_coeff = &s->ract_vlc[pt][ct][cg];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment