From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 2 Feb 2015 01:22:34 +0000 (+0100)
Subject: svq1dec: Validate the stages value strictly
X-Git-Tag: android-x86-6.0-r1~10^2~164
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9b8c8a9395c849639aea0f6b5300e991e93c3a73;p=android-x86%2Fexternal-ffmpeg.git

svq1dec: Validate the stages value strictly

It can be less than -1.

Bug-Id: CID 1194397 / CID 1194398
CC: libav-stable@libav.org
---

diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 789a0132fb..909ace7b7f 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -191,7 +191,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels,
             continue;   /* skip vector */
         }
 
-        if (stages > 0 && level >= 4) {
+        if ((stages > 0 && level >= 4) || stages < 0) {
             av_dlog(NULL,
                     "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n",
                     stages, level);
@@ -253,7 +253,7 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels,
         if (stages == -1)
             continue;           /* skip vector */
 
-        if ((stages > 0) && (level >= 4)) {
+        if ((stages > 0 && level >= 4) || stages < 0) {
             av_dlog(NULL,
                     "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n",
                     stages, level);