[FFmpeg-cvslog] avcodec/rscc: check input buffer size for deflate mode

[James Almer]

ffmpeg | branch: release/3.0 | James Almer <jamrial at gmail.com> | Tue May 10 22:07:19 2016 -0300| [8dce66d33d4182232abc763063bf49dfcce11a94] | committer: James Almer

avcodec/rscc: check input buffer size for deflate mode

Fixes overreads.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit b2244fa0a624f7e38893d58265e9c039bed2e4de)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dce66d33d4182232abc763063bf49dfcce11a94
---

 libavcodec/rscc.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c
index a2f7a0d..0c3e818 100644
--- a/libavcodec/rscc.c
+++ b/libavcodec/rscc.c
@@ -223,6 +223,12 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
 
     ff_dlog(avctx, "pixel_size %d packed_size %d.\n", pixel_size, packed_size);
 
+    if (packed_size < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid tile size %d\n", packed_size);
+        ret = AVERROR_INVALIDDATA;
+        goto end;
+    }
+
     /* Get pixels buffer, it may be deflated or just raw */
     if (pixel_size == packed_size) {
         if (bytestream2_get_bytes_left(gbc) < pixel_size) {
@@ -233,6 +239,11 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
         pixels = gbc->buffer;
     } else {
         uLongf len = ctx->inflated_size;
+        if (bytestream2_get_bytes_left(gbc) < packed_size) {
+            av_log(avctx, AV_LOG_ERROR, "Insufficient input for %d\n", packed_size);
+            ret = AVERROR_INVALIDDATA;
+            goto end;
+        }
         ret = uncompress(ctx->inflated_buf, &len, gbc->buffer, packed_size);
         if (ret) {
             av_log(avctx, AV_LOG_ERROR, "Pixel deflate error %d.\n", ret);