]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
alac : check readsamplesize to ensure get_bits() doesn't
authorjai_menon <jai_menon@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 22 Aug 2008 15:09:20 +0000 (15:09 +0000)
committerjai_menon <jai_menon@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 22 Aug 2008 15:09:20 +0000 (15:09 +0000)
fail. Patch by Matthieu Castet <castet.matthieu AT free fr>

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14905 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/alac.c

index cb710a634637c77b9623d22f8db6131f0d11c58a..1817161160817ace60fcf0bfd79cd0836b229fa4 100644 (file)
@@ -411,7 +411,7 @@ static int alac_decode_frame(AVCodecContext *avctx,
     int channels;
     unsigned int outputsamples;
     int hassize;
-    int readsamplesize;
+    unsigned int readsamplesize;
     int wasted_bytes;
     int isnotcompressed;
     uint8_t interlacing_shift;
@@ -476,6 +476,10 @@ static int alac_decode_frame(AVCodecContext *avctx,
 
     *outputsize = outputsamples * alac->bytespersample;
     readsamplesize = alac->setinfo_sample_size - (wasted_bytes * 8) + channels - 1;
+    if (readsamplesize > MIN_CACHE_BITS) {
+        av_log(avctx, AV_LOG_ERROR, "readsamplesize too big (%d)\n", readsamplesize);
+        return -1;
+    }
 
     if (!isnotcompressed) {
         /* so it is compressed */