virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

nuv: Pad the lzo outbuf

Browse Source 
And properly update the buf_size with the correct size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2013-08-12 11:34:06 +02:00
parent aae159a7cc
commit 075dbc1855
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/nuv.c
View File

@ -125,7 +125,8 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height,
avctx->width = c->width = width; avctx->width = c->width = width;
avctx->height = c->height = height; avctx->height = c->height = height;
av_fast_malloc(&c->decomp_buf, &c->decomp_size, 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) { if (!c->decomp_buf) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Can't allocate decompression buffer.\n"); "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 = &buf[12];
buf_size -= 12; buf_size -= 12;
if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { 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)) { if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) {
av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
buf = c->decomp_buf; buf = c->decomp_buf;
buf_size = c->decomp_size; buf_size = outlen;
} }
if (c->codec_frameheader) { if (c->codec_frameheader) {
int w, h, q; int w, h, q;