[FFmpeg-cvslog] mlpdec: do not try to allocate a zero-sized output buffer.

Anton Khirnov git at videolan.org
Tue Feb 26 03:39:02 CET 2013


ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Thu Feb 14 14:05:35 2013 +0100| [e2cf32ca5f58f7f09dab8730e34aef00c986015f] | committer: Reinhard Tartler

mlpdec: do not try to allocate a zero-sized output buffer.

CC:libav-stable at libav.org
(cherry picked from commit 0dff40bfb9a0b24d56ecd64cd90c8f724cc5745f)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

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

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 80ff401..0eaf2e3 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -978,6 +978,11 @@ static int output_data(MLPDecodeContext *m, unsigned int substr,
         return AVERROR_INVALIDDATA;
     }
 
+    if (!s->blockpos) {
+        av_log(avctx, AV_LOG_ERROR, "No samples to output.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     /* get output buffer */
     m->frame.nb_samples = s->blockpos;
     if ((ret = ff_get_buffer(avctx, &m->frame)) < 0) {



More information about the ffmpeg-cvslog mailing list