summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-10-15 15:59:53 +0000
committerPaul B Mahol <onemda@gmail.com>2012-10-15 15:59:53 +0000
commitd7d5b5dfc1b6f29646d2c1908c9bac8677f34256 (patch)
treed1ce880fe90c7ada874dfe46912ca8d1bbdeb553
parent295218f531528d18f0f21937d3ddf28318898a7c (diff)
flvdec: check return value of create_stream()
Fixes null pointer dereference. Fixes CID732242. Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavformat/flvdec.c2
1 files changed, 2 insertions, 0 deletions
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);