RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vp5: Fix illegal read. 

Found with Address Sanitizer
This commit is contained in:
Alex Converse 2011-11-17 10:06:14 -08:00
parent e0966eb140
commit bb4b0ad83b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vp5.c
View File

@ -185,7 +185,8 @@ static void vp5_parse_coeff(VP56Context *s)
model1 = model->coeff_dccv[pt]; model1 = model->coeff_dccv[pt];
model2 = model->coeff_dcct[pt][ctx]; 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[0])) {
if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[2])) {
if (vp56_rac_get_prob(c, model2[3])) { if (vp56_rac_get_prob(c, model2[3])) {
@ -222,8 +223,11 @@ static void vp5_parse_coeff(VP56Context *s)
ct = 0; ct = 0;
s->coeff_ctx[vp56_b6to4[b]][coeff_idx] = 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]; ctx = s->coeff_ctx[vp56_b6to4[b]][coeff_idx];
model1 = model->coeff_ract[pt][ct][cg]; model1 = model->coeff_ract[pt][ct][cg];
model2 = cg > 2 ? model1 : model->coeff_acct[pt][ct][cg][ctx]; model2 = cg > 2 ? model1 : model->coeff_acct[pt][ct][cg][ctx];