[FFmpeg-cvslog] avformat/libquvi: Fix whitelist handling

Gilles Chanteperdrix git at videolan.org
Wed Apr 8 14:50:33 CEST 2015


ffmpeg | branch: master | Gilles Chanteperdrix <gilles.chanteperdrix at xenomai.org> | Wed Apr  8 14:38:11 2015 +0200| [21e034a47a2b407f0896114a995fd507f0f5230f] | committer: Michael Niedermayer

avformat/libquvi: Fix whitelist handling

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21e034a47a2b407f0896114a995fd507f0f5230f
---

 libavformat/libquvi.c |    3 +++
 1 file changed, 3 insertions(+)

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;
 



More information about the ffmpeg-cvslog mailing list