From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 26 Mar 2012 22:12:03 +0000 (+0200)
Subject: targa: Fix input buffer size check.
X-Git-Tag: android-x86-4.4-r1~12736
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=43fd3212521e3a44b99a6b1ef9bf9bcdddd086e8;p=android-x86%2Fexternal-ffmpeg.git

targa: Fix input buffer size check.

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

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 5ddd21bfef..55841956ad 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -229,7 +229,7 @@ static int decode_frame(AVCodecContext *avctx,
             buf += res;
         }else{
             size_t img_size = s->width * ((s->bpp + 1) >> 3);
-            CHECK_BUFFER_SIZE(buf, buf_end, img_size, "image data");
+            CHECK_BUFFER_SIZE(buf, buf_end, img_size * s->height , "image data");
             for(y = 0; y < s->height; y++){
                     memcpy(dst, buf, img_size);