X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fprosumer.c;h=9950519604c53a8f8f618a8527708095d3f8534e;hb=d6cb7bf5995fe8af6ad79cf38a7aaa3b4fda6628;hp=ce3cbdbb734f43200a5a1f2495c9fecb8f1b9aa6;hpb=62f8d27ef1995354d6529ea0d9428501d7f914b4;p=ffmpeg

diff --git a/libavcodec/prosumer.c b/libavcodec/prosumer.c
index ce3cbdbb734..9950519604c 100644
--- a/libavcodec/prosumer.c
+++ b/libavcodec/prosumer.c
@@ -153,12 +153,17 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     if (avpkt->size <= 32)
         return AVERROR_INVALIDDATA;
 
-    memset(s->decbuffer, 0, s->size);
     bytestream2_init(&s->gb, avpkt->data, avpkt->size);
     bytestream2_init_writer(&s->pb, s->decbuffer, s->size);
     ret = decompress(&s->gb, AV_RL32(avpkt->data + 28) >> 1, &s->pb, s->lut);
     if (ret < 0)
         return ret;
+    if (bytestream2_get_bytes_left_p(&s->pb) > s->size * (int64_t)avctx->discard_damaged_percentage / 100)
+        return AVERROR_INVALIDDATA;
+
+    av_assert0(s->size >= bytestream2_get_bytes_left_p(&s->pb));
+    memset(s->decbuffer + bytestream2_tell_p(&s->pb), 0, bytestream2_get_bytes_left_p(&s->pb));
+
     vertical_predict((uint32_t *)s->decbuffer, 0, (uint32_t *)s->initial_line, s->stride, 1);
     vertical_predict((uint32_t *)s->decbuffer, s->stride, (uint32_t *)s->decbuffer, s->stride, avctx->height - 1);