From 2a70d8304dd2f8e97b9b0d2321ffbf6da69093f1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 19 Apr 2012 21:43:15 +0200 Subject: jvdec: Make sure there is enough data for the id string. Previously too little data could lead to a false detection. Signed-off-by: Michael Niedermayer --- libavformat/jvdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index fbd4f1e5f4..3977594f8b 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -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; } -- cgit v1.2.3