[SCM] libav/experimental: flacdec: skip frame when allocated data size is too small

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


The following commit has been merged in the experimental branch:
commit b6fa746e391a3b3a80fe4d7c14795b5cf716e16b
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sun Mar 22 21:31:23 2009 +0000

    flacdec: skip frame when allocated data size is too small
    
    Originally committed as revision 18155 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 80701f1..a3ce1aa 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -693,7 +693,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
     if (output_size > alloc_data_size) {
         av_log(s->avctx, AV_LOG_ERROR, "output data size is larger than "
                                        "allocated data size\n");
-        return -1;
+        goto end;
     }
     *data_size = output_size;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list