generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp6: Fix illegal read.

Browse Source 
(cherry picked from commit 2a6eb06254)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 67a7ed623b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 8d68083298)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Alex Converse
2011-11-03 15:55:52 -07:00
committed by Reinhard Tartler
parent 8abf1d882e
commit 7739947671
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vp6.c
View File

@@ -365,7 +365,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]--;
@@ -400,6 +400,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];
} }