[FFmpeg-cvslog] mp3on4: check for allocation failures in decode_init_mp3on4()
Justin Ruggles
git at videolan.org
Sat Oct 22 01:26:50 CEST 2011
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Sep 25 14:32:42 2011 -0400| [95891804bf300b266aa5328f1c338c046720e658] | committer: Justin Ruggles
mp3on4: check for allocation failures in decode_init_mp3on4()
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95891804bf300b266aa5328f1c338c046720e658
---
libavcodec/mpegaudiodec.c | 4 ++++
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;
More information about the ffmpeg-cvslog
mailing list