[libav-devel] [PATCH 06/17] atrac1: check for ff_mdct_init() failure

[Justin Ruggles]

---
 libavcodec/atrac1.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index c646ba9..043fad3 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -329,6 +329,7 @@ static int atrac1_decode_frame(AVCodecContext *avctx, void 
*data,
 static av_cold int atrac1_decode_init(AVCodecContext *avctx)
 {
     AT1Ctx *q = avctx->priv_data;
+    int ret;
 
     avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
@@ -349,9 +350,13 @@ static av_cold int atrac1_decode_init(AVCodecContext 
*avctx)
     }
 
     /* Init the mdct transforms */
-    ff_mdct_init(&q->mdct_ctx[0], 6, 1, -1.0/ (1 << 15));
-    ff_mdct_init(&q->mdct_ctx[1], 8, 1, -1.0/ (1 << 15));
-    ff_mdct_init(&q->mdct_ctx[2], 9, 1, -1.0/ (1 << 15));
+    if ((ret = ff_mdct_init(&q->mdct_ctx[0], 6, 1, -1.0/ (1 << 15))) ||
+        (ret = ff_mdct_init(&q->mdct_ctx[1], 8, 1, -1.0/ (1 << 15))) ||
+        (ret = ff_mdct_init(&q->mdct_ctx[2], 9, 1, -1.0/ (1 << 15)))) {
+        av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n");
+        av_freep(&q->out_samples[0]);
+        return ret;
+    }
 
     ff_init_ff_sine_windows(5);
 
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel