[SCM] libav/experimental: 10l, add check forgotten in last commit

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 048905a484cde2abc051ed965d5ac6b973acbc79
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Sep 9 08:52:53 2007 +0000

    10l, add check forgotten in last commit
    
    Originally committed as revision 10442 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 665527b..d07c868 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -158,6 +158,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_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;
+        }
         buf = &buf[12];
         buf_size -= 12;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list