dfa: check for invalid access in decode_wdlt().
authorAnton Khirnov <anton@khirnov.net>
Wed, 27 Mar 2013 17:18:38 +0000 (18:18 +0100)
committerReinhard Tartler <siretart@tauware.de>
Wed, 24 Apr 2013 19:01:14 +0000 (21:01 +0200)
This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3623589edc7b1257bb45aa9e52c9631e133f22b6)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/dfa.c

index c2f8002..0ae89a8 100644 (file)
@@ -258,6 +258,8 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
             segments = bytestream2_get_le16(gb);
         }
         line_ptr = frame;
+        if (frame_end - frame < width)
+            return AVERROR_INVALIDDATA;
         frame += width;
         y++;
         while (segments--) {