jvdec: Make sure there is enough data for the id string.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Apr 2012 19:43:15 +0000 (21:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Apr 2012 19:43:15 +0000 (21:43 +0200)
Previously too little data could lead to a false detection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/jvdec.c

index fbd4f1e..3977594 100644 (file)
@@ -52,8 +52,8 @@ typedef struct {
 
 static int read_probe(AVProbeData *pd)
 {
-    if (pd->buf[0] == 'J' && pd->buf[1] == 'V' &&
-        !memcmp(pd->buf + 4, MAGIC, FFMIN(strlen(MAGIC), pd->buf_size - 4)))
+    if (pd->buf[0] == 'J' && pd->buf[1] == 'V' && strlen(MAGIC) <= pd->buf_size - 4 &&
+        !memcmp(pd->buf + 4, MAGIC, strlen(MAGIC)))
         return AVPROBE_SCORE_MAX;
     return 0;
 }