Commit 62e52b94 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Vittorio Giovara

vorbis_parser: Move vp check to avoid a null pointer dereference

CC: libav-stable@libav.org
Bug-Id: CID 1251347
parent c117da9d
...@@ -303,9 +303,9 @@ static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx, ...@@ -303,9 +303,9 @@ static int vorbis_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
if (!s->vp && avctx->extradata && avctx->extradata_size) { if (!s->vp && avctx->extradata && avctx->extradata_size) {
s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size); s->vp = av_vorbis_parse_init(avctx->extradata, avctx->extradata_size);
}
if (!s->vp) if (!s->vp)
goto end; goto end;
}
if ((duration = av_vorbis_parse_frame(s->vp, buf, buf_size)) >= 0) if ((duration = av_vorbis_parse_frame(s->vp, buf, buf_size)) >= 0)
s1->duration = duration; s1->duration = duration;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment