Merge commit '25c2a27c9ec0150210d75ee5ac8ed1bfa14c1a56'

[ffmpeg] / libavcodec / smc.c

diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 79f9a757a0502e63768b287273eb2af7f5605720..3cb48347378dabe386cd06c1868367ed3b3240ff 100644 (file)
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -438,6 +438,10 @@ static int smc_decode_frame(AVCodecContext *avctx,
     int pal_size;
     const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &pal_size);
     int ret;
+    int total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
+
+    if (total_blocks / 1024 > avpkt->size)
+        return AVERROR_INVALIDDATA;
 
     bytestream2_init(&s->gb, buf, buf_size);