diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-11-03 15:55:52 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-24 16:14:41 +0100 |
| commit | 7739947671f6b8b9f0f56132bc6b389baad404fd (patch) | |
| tree | f558971000ea4a6aaf54c157546c2d0a3a015800 | |
| parent | 8abf1d882eee75e9fe2b31f387afaf5ad339f4b3 (diff) | |
| download | ffmpeg-7739947671f6b8b9f0f56132bc6b389baad404fd.tar.gz | |
vp6: Fix illegal read.
(cherry picked from commit 2a6eb06254df79e96b3d791b6b89b2534ced3119)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 67a7ed623b678a84c992dd7bf3e3d0329f83621b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 8d68083298e2481669de4db0b7b86c915119df6d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/vp6.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 5071903701..9197b4609b 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -365,7 +365,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s) if (b > 3) pt = 1; vlc_coeff = &s->dccv_vlc[pt]; - for (coeff_idx=0; coeff_idx<64; ) { + for (coeff_idx = 0;;) { int run = 1; if (coeff_idx<2 && 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; + if (coeff_idx >= 64) + break; cg = FFMIN(vp6_coeff_groups[coeff_idx], 3); vlc_coeff = &s->ract_vlc[pt][ct][cg]; } |