From d7d5b5dfc1b6f29646d2c1908c9bac8677f34256 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 15 Oct 2012 15:59:53 +0000 Subject: flvdec: check return value of create_stream() Fixes null pointer dereference. Fixes CID732242. Signed-off-by: Paul B Mahol --- libavformat/flvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 8c6807a260..24302f6b53 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -730,6 +730,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n"); st = create_stream(s, (int[]){AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA}[stream_type]); + if (!st) + return AVERROR(ENOMEM); } av_dlog(s, "%d %X %d \n", stream_type, flags, st->discard); -- cgit v1.2.3