[FFmpeg-cvslog] vp6: Fix illegal read.

Alex Converse git at videolan.org
Sun Dec 25 01:36:04 CET 2011


ffmpeg | branch: release/0.6 | Alex Converse <alex.converse at gmail.com> | Thu Nov  3 15:55:52 2011 -0700| [8d68083298e2481669de4db0b7b86c915119df6d] | committer: Reinhard Tartler

vp6: Fix illegal read.

(cherry picked from commit 2a6eb06254df79e96b3d791b6b89b2534ced3119)

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

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d68083298e2481669de4db0b7b86c915119df6d
---

 libavcodec/vp6.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 955a6e9..87834cd 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -373,7 +373,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]--;
@@ -410,6 +410,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];
         }



More information about the ffmpeg-cvslog mailing list