[FFmpeg-cvslog] avcodec/ffv1dec: Check quant table symbols more completely

Michael Niedermayer git at videolan.org
Mon May 4 14:32:56 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  4 13:25:31 2015 +0200| [3dfbdb328ed9e88cebc6462c56cfe61e55850b2e] | committer: Michael Niedermayer

avcodec/ffv1dec: Check quant table symbols more completely

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/ffv1dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 78d947a..621aac7 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -476,7 +476,7 @@ static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale)
     for (v = 0; i < 128; v++) {
         unsigned len = get_symbol(c, state, 0) + 1;
 
-        if (len > 128 - i)
+        if (len > 128 - i || !len)
             return AVERROR_INVALIDDATA;
 
         while (len--) {



More information about the ffmpeg-cvslog mailing list