From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 13 Apr 2012 20:57:23 +0000 (+0200)
Subject: dfa: Fix out of array write in decode_dds1()
X-Git-Tag: android-x86-4.4-r1~12424
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=72b9537d8886f679494651df517dfed9b420cf1f;p=android-x86%2Fexternal-ffmpeg.git

dfa: Fix out of array write in decode_dds1()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index 13637d6a05..9664b47d4f 100644
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -149,7 +149,7 @@ static int decode_dds1(GetByteContext *gb, uint8_t *frame, int width, int height
             bitbuf = bytestream2_get_le16u(gb);
             mask = 1;
         }
-        if (frame_end - frame < 2)
+        if (frame_end - frame < width + 2)
             return -1;
         if (bitbuf & mask) {
             v = bytestream2_get_le16(gb);