From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Date: Wed, 11 Nov 2015 00:14:57 +0000 (+0100)
Subject: dds: validate source buffer size before copying
X-Git-Tag: android-x86-7.1-r1~252^2~1784
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e6459c655e110cd9acb5d0658d89c415eaca847b;p=android-x86%2Fexternal-ffmpeg.git

dds: validate source buffer size before copying

If it is too small av_image_copy_plane segfaults.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---

diff --git a/libavcodec/dds.c b/libavcodec/dds.c
index 04b1dd2de8..0f045d6a07 100644
--- a/libavcodec/dds.c
+++ b/libavcodec/dds.c
@@ -668,6 +668,12 @@ static int dds_decode(AVCodecContext *avctx, void *data,
             frame->palette_has_changed = 1;
         }
 
+        if (bytestream2_get_bytes_left(gbc) < frame->height * linesize) {
+            av_log(avctx, AV_LOG_ERROR, "Buffer is too small (%d < %d).\n",
+                   bytestream2_get_bytes_left(gbc), frame->height * linesize);
+            return AVERROR_INVALIDDATA;
+        }
+
         av_image_copy_plane(frame->data[0], frame->linesize[0],
                             gbc->buffer, linesize,
                             linesize, frame->height);