From 4bf3fab2811509a4f9ca932191e9bfa801ceeae2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 16 Feb 2015 19:31:42 +0100 Subject: hls: fix a null pointer dereference Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where it tries to dereference the field. Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8 Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/hls.c') diff --git a/libavformat/hls.c b/libavformat/hls.c index f17b826f30..4fdda3408c 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1313,14 +1313,14 @@ static int hls_read_header(AVFormatContext *s) struct playlist *pls = c->playlists[i]; AVInputFormat *in_fmt = NULL; - if (pls->n_segments == 0) - continue; - if (!(pls->ctx = avformat_alloc_context())) { ret = AVERROR(ENOMEM); goto fail; } + if (pls->n_segments == 0) + continue; + pls->index = i; pls->needed = 1; pls->parent = s; -- cgit v1.2.3