summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>2015-04-08 14:38:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-08 14:40:56 +0200
commit21e034a47a2b407f0896114a995fd507f0f5230f (patch)
treeaf78fe7bd598cc62d917a0f7e96b3ed2be492195
parent845ab37b05e1101f538543f4e35ce0672ad8690b (diff)
downloadffmpeg-streaming-21e034a47a2b407f0896114a995fd507f0f5230f.zip
ffmpeg-streaming-21e034a47a2b407f0896114a995fd507f0f5230f.tar.gz
avformat/libquvi: Fix whitelist handling
Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/libquvi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/libquvi.c b/libavformat/libquvi.c
index 0a593cc..7c5f7a2 100644
--- a/libavformat/libquvi.c
+++ b/libavformat/libquvi.c
@@ -76,6 +76,9 @@ static int libquvi_read_header(AVFormatContext *s)
if (rc != QUVI_OK)
goto quvi_fail;
+ if (!(qc->fmtctx = avformat_alloc_context()))
+ goto quvi_fail;
+
if ((ret = ff_copy_whitelists(qc->fmtctx, s)) < 0)
goto end;
OpenPOWER on IntegriCloud