From 0dff40bfb9a0b24d56ecd64cd90c8f724cc5745f Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 14 Feb 2013 14:05:35 +0100
Subject: mlpdec: do not try to allocate a zero-sized output buffer.

CC:libav-stable@libav.org
---
 libavcodec/mlpdec.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libavcodec/mlpdec.c')

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index cf01b6e23c..130ce26d6c 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -984,6 +984,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 */
     frame->nb_samples = s->blockpos;
     if ((ret = ff_get_buffer(avctx, frame)) < 0) {
-- 
cgit v1.2.1