summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-25 14:32:42 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-21 12:34:43 -0400
commit95891804bf300b266aa5328f1c338c046720e658 (patch)
treedea4119e57e0971b349fa5b602ef8164d8b66dd4
parent180bf988bc524f4775dd4765f07816df324e808b (diff)
downloadffmpeg-streaming-95891804bf300b266aa5328f1c338c046720e658.zip
ffmpeg-streaming-95891804bf300b266aa5328f1c338c046720e658.tar.gz
mp3on4: check for allocation failures in decode_init_mp3on4()
-rw-r--r--libavcodec/mpegaudiodec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 040b109..2b357b5 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1972,6 +1972,8 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
*/
// Allocate zeroed memory for the first decoder context
s->mp3decctx[0] = av_mallocz(sizeof(MPADecodeContext));
+ if (!s->mp3decctx[0])
+ goto alloc_fail;
// Put decoder context in place to make init_decode() happy
avctx->priv_data = s->mp3decctx[0];
decode_init(avctx);
@@ -1984,6 +1986,8 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
*/
for (i = 1; i < s->frames; i++) {
s->mp3decctx[i] = av_mallocz(sizeof(MPADecodeContext));
+ if (!s->mp3decctx[i])
+ goto alloc_fail;
s->mp3decctx[i]->adu_mode = 1;
s->mp3decctx[i]->avctx = avctx;
s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
OpenPOWER on IntegriCloud