From fb45de779c8db142b44bf7b00c535ea2eee4f148 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 24 Sep 2013 00:29:02 +0200 Subject: [PATCH] avformat/omadec: simplify checks in nprobe() Signed-off-by: Michael Niedermayer --- libavformat/omadec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/omadec.c b/libavformat/omadec.c index d0cb6d49a7..fe1f56ec15 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -171,11 +171,7 @@ static int nprobe(AVFormatContext *s, uint8_t *enc_header, unsigned size, taglen = AV_RB32(&enc_header[pos + 32]); datalen = AV_RB32(&enc_header[pos + 36]) >> 4; - pos += 44; - if (size - pos < taglen) - return -1; - - pos += taglen; + pos += 44L + taglen; if (pos + (((uint64_t)datalen) << 4) > size) return -1;