From: Luca Barbato <lu_zero@gentoo.org>
Date: Sun, 23 Aug 2015 09:58:47 +0000 (+0200)
Subject: aac: Make sure to set err on the failure path
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d5eab59a5373b22aa52d6053a8e853e95a6e131e;p=ffmpeg

aac: Make sure to set err on the failure path

Bug-Id: CID 1308153
---

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index d7e0aa57f0c..f0c7960d28d 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2834,8 +2834,10 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
     while ((elem_type = get_bits(gb, 3)) != TYPE_END) {
         elem_id = get_bits(gb, 4);
 
-        if (!avctx->channels && elem_type != TYPE_PCE)
+        if (!avctx->channels && elem_type != TYPE_PCE) {
+            err = AVERROR_INVALIDDATA;
             goto fail;
+        }
 
         if (elem_type < TYPE_DSE) {
             if (!(che=get_che(ac, elem_type, elem_id))) {