summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-11 18:08:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-11 18:09:11 +0100
commit44c23aa1b85d195db6647d24e3b1d3de051790db (patch)
treed68b05a44c996a3cd603ff855d7c4c45a7f08ea4
parent3ba58433e17cb6019e512e7fa5cf4e38415217d3 (diff)
zmbvdec: check decompression buffer size.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/zmbv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 762d5728a2..8727bfc8b9 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -502,8 +502,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
if (c->comp == 0) { //Uncompressed data
+ if (c->decomp_size < len) {
+ av_log(avctx, AV_LOG_ERROR, "decomp 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 = (uint8_t*)buf;