From 075dbc185521f193c98b896cd63be3ec2613df5d Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 12 Aug 2013 11:34:06 +0200 Subject: [PATCH] nuv: Pad the lzo outbuf And properly update the buf_size with the correct size. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org --- libavcodec/nuv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 269bf8bfbb..0905411449 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -125,7 +125,8 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, avctx->width = c->width = width; avctx->height = c->height = height; av_fast_malloc(&c->decomp_buf, &c->decomp_size, - c->height * c->width * 3 / 2); + c->height * c->width * 3 / 2 + + FF_INPUT_BUFFER_PADDING_SIZE); if (!c->decomp_buf) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); @@ -199,13 +200,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf = &buf[12]; buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { - int outlen = c->decomp_size, inlen = buf_size; + int outlen = c->decomp_size - FF_INPUT_BUFFER_PADDING_SIZE; + int inlen = buf_size; if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) { av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); return AVERROR_INVALIDDATA; } buf = c->decomp_buf; - buf_size = c->decomp_size; + buf_size = outlen; } if (c->codec_frameheader) { int w, h, q;