[FFmpeg-cvslog] tta: check for allocation failure of decode_buffer

Justin Ruggles git at videolan.org
Wed Oct 26 02:46:28 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Oct 24 09:20:07 2011 -0400| [2f1d212fd0e62bd8cb2799e15661aa59e38f2a13] | committer: Justin Ruggles

tta: check for allocation failure of decode_buffer

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

 libavcodec/tta.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index ddfcb2e..ed8d76b 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -263,10 +263,14 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
 
         if (s->bps == 2) {
             s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels);
+            if (!s->decode_buffer)
+                return AVERROR(ENOMEM);
         }
         s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx));
-        if (!s->ch_ctx)
+        if (!s->ch_ctx) {
+            av_freep(&s->decode_buffer);
             return AVERROR(ENOMEM);
+        }
     } else {
         av_log(avctx, AV_LOG_ERROR, "Wrong extradata present\n");
         return -1;



More information about the ffmpeg-cvslog mailing list