OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
167ea1f
)
aac: Make sure to set err on the failure path
author
Luca Barbato
<lu_zero@gentoo.org>
Sun, 23 Aug 2015 09:58:47 +0000
(11:58 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Sun, 23 Aug 2015 19:44:38 +0000
(21:44 +0200)
Bug-Id: CID
1308153
libavcodec/aacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec.c
b/libavcodec/aacdec.c
index
d7e0aa5
..
f0c7960
100644
(file)
--- 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))) {