Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'

[ffmpeg] / libavcodec / lcldec.c

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 159e0a1401b37bd525f35c73dbe29d2fdaa2bd66..f8d45da95aa74bdc5538ba4fadaf6efbabc6c5d5 100644 (file)
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -203,6 +203,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
                 ;
             } else if (c->flags & FLAG_MULTITHREAD) {
                 mthread_inlen = AV_RL32(encoded);
+                if (len < 8) {
+                    av_log(avctx, AV_LOG_ERROR, "len %d is too small\n", len);
+                    return AVERROR_INVALIDDATA;
+                }
                 mthread_inlen = FFMIN(mthread_inlen, len - 8);
                 mthread_outlen = AV_RL32(encoded+4);
                 mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);