aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-08-23 11:58:47 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-08-23 21:44:38 +0200
commitd5eab59a5373b22aa52d6053a8e853e95a6e131e (patch)
tree0bc3396a434f86b4413352cd81c9c229900e9e6d
parent167ea1fbf15ecefa30729f9b8d091ed431bf43bd (diff)
downloadffmpeg-d5eab59a5373b22aa52d6053a8e853e95a6e131e.tar.gz
aac: Make sure to set err on the failure path
Bug-Id: CID 1308153
-rw-r--r--libavcodec/aacdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index d7e0aa57f0..f0c7960d28 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))) {