dsicinav: Bound-check the source buffer when needed
authorLuca Barbato <lu_zero@gentoo.org>
Fri, 19 Jul 2013 19:09:40 +0000 (21:09 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Sat, 24 Aug 2013 10:17:28 +0000 (12:17 +0200)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit dd0bfc3a6a310e3e3674ce7742672d689a9a0e93)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/dsicinav.c

index df81c58..7f5c1da 100644 (file)
@@ -196,11 +196,13 @@ static void cin_decode_rle(const unsigned char *src, int src_size,
     while (src < src_end && dst < dst_end) {
         code = *src++;
         if (code & 0x80) {
+            if (src >= src_end)
+                break;
             len = code - 0x7F;
             memset(dst, *src++, FFMIN(len, dst_end - dst));
         } else {
             len = code + 1;
-            memcpy(dst, src, FFMIN(len, dst_end - dst));
+            memcpy(dst, src, FFMIN3(len, dst_end - dst, src_end - src));
             src += len;
         }
         dst += len;