[FFmpeg-cvslog] atrac1: Check block align.

Michael Niedermayer git at videolan.org
Sat Nov 24 16:38:54 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 24 16:17:29 2012 +0100| [ed017ab945ed2ce13352a0eb627a21e875082834] | committer: Michael Niedermayer

atrac1: Check block align.

Fixes OOM
Fixes second samples posted in Ticket1893

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

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

 libavcodec/atrac1.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index 26f5cb1..1ba5593 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -343,6 +343,11 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
         return AVERROR(EINVAL);
     }
 
+    if (avctx->block_align <= 0) {
+        av_log_ask_for_sample(avctx, "unsupported block align\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     /* Init the mdct transforms */
     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))) ||



More information about the ffmpeg-cvslog mailing list