Mercurial > libavcodec.hg

changeset 11612:90b6d031c821 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extradata length checks for Huffyuv. Patch by Michael Kaufmann hallo $(name) dash $(surname) ch
author benoit
date Mon, 12 Apr 2010 16:16:43 +0000
parents a207cc043de8
children 2c41284050cf
files huffyuv.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/huffyuv.c	Mon Apr 12 16:05:10 2010 +0000
+++ b/huffyuv.c	Mon Apr 12 16:16:43 2010 +0000
@@ -452,6 +452,9 @@
     if(s->version==2){
         int method, interlace;
 
+        if (avctx->extradata_size < 4)
+            return -1;
+
         method= ((uint8_t*)avctx->extradata)[0];
         s->decorrelate= method&64 ? 1 : 0;
         s->predictor= method&63;
@@ -462,7 +465,7 @@
         s->interlaced= (interlace==1) ? 1 : (interlace==2) ? 0 : s->interlaced;
         s->context= ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
 
-        if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size) < 0)
+        if(read_huffman_tables(s, ((uint8_t*)avctx->extradata)+4, avctx->extradata_size-4) < 0)
             return -1;
     }else{
         switch(avctx->bits_per_coded_sample&7){