On 11/24/2014 10:48 AM, Vittorio Giovara wrote:
From: Michael Niedermayer <[email protected]>

Fixes null pointer dereference
Fixes CID1251347

Signed-off-by: Michael Niedermayer <[email protected]>
---
  libavcodec/vorbis_parser.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vorbis_parser.c b/libavcodec/vorbis_parser.c
index 0d72fb1..b99f115 100644
--- a/libavcodec/vorbis_parser.c
+++ b/libavcodec/vorbis_parser.c
@@ -330,9 +330,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;


LGTM

-Justin

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to