[FFmpeg-cvslog] tta: Add some safety precautions to avoid freeing things that have not been allocated .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 11 02:06:24 2012 +0100| [ed83f97235b6b3bd2cf62830bba00dfd7327d389] | committer: Michael Niedermayer

tta: Add some safety precautions to avoid freeing things that have not been allocated.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 0e3bbd2..6b8e0e9 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -283,7 +283,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
             s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels);
             if (!s->decode_buffer)
                 return AVERROR(ENOMEM);
-        }
+        } else
+            s->decode_buffer = NULL;
         s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx));
         if (!s->ch_ctx) {
             av_freep(&s->decode_buffer);
@@ -449,7 +450,9 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
 static av_cold int tta_decode_close(AVCodecContext *avctx) {
     TTAContext *s = avctx->priv_data;
 
-    av_free(s->decode_buffer);
+    if (s->bps < 3)
+        av_free(s->decode_buffer);
+    s->decode_buffer = NULL;
     av_freep(&s->ch_ctx);
 
     return 0;