Merge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'

* commit '342c43d154e586bc022c86b168fe8d36f69da9d3':
  omadec: Properly check lengths before incrementing the position

See: f1d6f013b2078140fb701978d720abecde7cd73f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index fd7eb0bf7ff69277895454b60ae92c63cb326117..d0cb6d49a712314779a05345f79f836b7304afd0 100644 (file)
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -171,7 +171,11 @@ 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 + taglen;
+    pos += 44;
+    if (size - pos < taglen)
+        return -1;
+
+    pos += taglen;
 
     if (pos + (((uint64_t)datalen) << 4) > size)
         return -1;