vorbis_parser: Move vp check to avoid a null pointer dereference

CC: libav-stable@libav.org Bug-Id: CID 1251347

vorbis_parser: Move vp check to avoid a null pointer dereference
CC: libav-stable@libav.org Bug-Id: CID 1251347
62e52b94 · Michael Niedermayer · Vittorio Giovara · c117da9d · 62e52b94
Commit 62e52b94 authored Nov 24, 2014 by Michael Niedermayer Committed by Vittorio Giovara Nov 25, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

vorbis_parser.c libavcodec/vorbis_parser.c +2 -2

No files found.
--- a/libavcodec/vorbis_parser.c
+++ b/libavcodec/vorbis_parser.c
@@ -303,9 +303,9 @@ static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx,

    if (!s->vp && avctx->extradata && avctx->extradata_size) {
        s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size);
-        if (!s->vp)
-            goto end;
    }
+    if (!s->vp)
+        goto end;

    if ((duration = av_vorbis_parse_frame(s->vp, buf, buf_size)) >= 0)
        s1->duration = duration;