[FFmpeg-cvslog] takdec: check av_samples_get_buffer_size() return value

Vittorio Giovara git at videolan.org
Fri Dec 19 05:12:30 CET 2014


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Dec 17 15:19:42 2014 +0100| [5ac06633cb63fcc51f2471a3478b44d3f010b16b] | committer: Vittorio Giovara

takdec: check av_samples_get_buffer_size() return value

CC: libav-stable at libav.org
Bug-Id: CID 747734

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ac06633cb63fcc51f2471a3478b44d3f010b16b
---

 libavcodec/takdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index b0e84ea..16ccdba 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -748,6 +748,8 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
         int buf_size = av_samples_get_buffer_size(NULL, avctx->channels,
                                                   s->nb_samples,
                                                   AV_SAMPLE_FMT_S32P, 0);
+        if (buf_size < 0)
+            return buf_size;
         av_fast_malloc(&s->decode_buffer, &s->decode_buffer_size, buf_size);
         if (!s->decode_buffer)
             return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list