aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-26 20:11:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-05-19 20:25:11 +0200
commit86be9cda97d2577165127c3b7075aa6a038995ab (patch)
tree640e1d4fe4ad9a7bcba130f7c3a37c2951a348de
parenta7dedd8ea53394cb7dc532aa8f2598c02327aa68 (diff)
downloadffmpeg-86be9cda97d2577165127c3b7075aa6a038995ab.tar.gz
avformat/mp3dec: Check for avcodec_alloc_context3() failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b851bc20c6931c084710e69f7eec30d8c1bdb68e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mp3dec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 7ad6845e5c..b3a78d0d8a 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -63,6 +63,9 @@ static int mp3_read_probe(AVProbeData *p)
const uint8_t *buf, *buf0, *buf2, *end;
AVCodecContext *avctx = avcodec_alloc_context3(NULL);
+ if (!avctx)
+ return 0;
+
buf0 = p->buf;
end = p->buf + p->buf_size - sizeof(uint32_t);
while(buf0 < end && !*buf0)