mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
authorJames Almer <jamrial@gmail.com>
Mon, 8 Jun 2015 20:39:38 +0000 (17:39 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 8 Jun 2015 21:26:42 +0000 (18:26 -0300)
The first check is done without the AVIOContext, so alloc it only if said check succeeds

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/mpjpegdec.c

index 56fe159..845e95c 100644 (file)
@@ -83,13 +83,13 @@ static int mpjpeg_read_probe(AVProbeData *p)
     char line[128] = { 0 };
     int ret = 0;
 
+    if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
+        return 0;
+
     pb = avio_alloc_context(p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL);
     if (!pb)
         return AVERROR(ENOMEM);
 
-    if (p->buf_size < 2 || p->buf[0] != '-' || p->buf[1] != '-')
-        goto end;
-
     while (!pb->eof_reached) {
         ret = get_line(pb, line, sizeof(line));
         if (ret < 0)
@@ -101,7 +101,6 @@ static int mpjpeg_read_probe(AVProbeData *p)
             break;
         }
     }
-end:
 
     av_free(pb);