[SCM] libav/experimental: Fix extreme stupidity: buffer size check must of course be before buffer use!

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:06:56 UTC 2013


The following commit has been merged in the experimental branch:
commit 6cf7e81f8cce20f1b39ab5a1485682b698db7e60
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Sep 9 09:00:12 2007 +0000

    Fix extreme stupidity: buffer size check must of course be before buffer use!
    
    Originally committed as revision 10443 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index d07c868..232cea3 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -156,12 +156,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         buf_size = c->decomp_size;
     }
     if (c->codec_frameheader) {
-        get_quant_quality(c, buf[10]);
-        rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
         if (buf_size < 12) {
             av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n");
             return -1;
         }
+        get_quant_quality(c, buf[10]);
+        rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
         buf = &buf[12];
         buf_size -= 12;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list