[SCM] libav/experimental: Do not decode more data than output buffer may hold

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:07:22 UTC 2013


The following commit has been merged in the experimental branch:
commit 675a0583b42f7eeac145dd0adf6d66d87c2af892
Author: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:   Sat Sep 22 09:09:47 2007 +0000

    Do not decode more data than output buffer may hold
    
    Originally committed as revision 10547 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index ecaa94e..f593a59 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -317,6 +317,8 @@ static int cinaudio_decode_frame(AVCodecContext *avctx,
     uint8_t *src = buf;
     int16_t *samples = (int16_t *)data;
 
+    buf_size = FFMIN(buf_size, *data_size/2);
+
     if (cin->initial_decode_frame) {
         cin->initial_decode_frame = 0;
         cin->delta = (int16_t)AV_RL16(src); src += 2;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list