Module: libav Branch: master Commit: 0d61f260010707f3028b818e8b24598e1a83d696
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sun Nov 11 18:08:39 2012 +0100 zmbvdec: Check the buffer size for uncompressed data Also don't pointlessly set the buffer size to 1 after copying one packet. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/zmbv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 0b38926..65fa5ff 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -499,8 +499,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac } if (c->comp == 0) { //Uncompressed data + if (c->decomp_size < len) { + av_log(avctx, AV_LOG_ERROR, "Buffer too small\n"); + return AVERROR_INVALIDDATA; + } memcpy(c->decomp_buf, buf, len); - c->decomp_size = 1; } else { // ZLIB-compressed data c->zstream.total_in = c->zstream.total_out = 0; c->zstream.next_in = buf; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
