Browse Source

avformat/omadec: simplify checks in nprobe()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
fb45de779c
1 changed files with 1 additions and 5 deletions
  1. +1
    -5
      libavformat/omadec.c

+ 1
- 5
libavformat/omadec.c View File

@@ -171,11 +171,7 @@ static int nprobe(AVFormatContext *s, uint8_t *enc_header, unsigned size,
taglen = AV_RB32(&enc_header[pos + 32]); taglen = AV_RB32(&enc_header[pos + 32]);
datalen = AV_RB32(&enc_header[pos + 36]) >> 4; 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) if (pos + (((uint64_t)datalen) << 4) > size)
return -1; return -1;


Loading…
Cancel
Save