MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cllc: Pad swapped buffer

Browse Source 
The bitstream buffer must be padded, or the bitstream reader might
read over the end.

Fixes the following valgrind warning:
    Use of uninitialised value of size 8 at 0x591BAE: cllc_decode_frame (cllc.c:166)

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2012-08-24 22:10:19 -04:00
parent 01cb4c84f5
commit aa7a565101
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/cllc.c
View File

@ -284,7 +284,8 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
/* Make sure our bswap16'd buffer is big enough */
swapped_buf_new = av_fast_realloc(ctx->swapped_buf,
&ctx->swapped_buf_size, avpkt->size);
&ctx->swapped_buf_size, avpkt->size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!swapped_buf_new) {
av_log(avctx, AV_LOG_ERROR, "Could not realloc swapped buffer.\n");
return AVERROR(ENOMEM);
@ -313,6 +314,10 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src,
(avpkt->size - info_offset) / 2);
/* Initialize padding to 0 */
memset(ctx->swapped_buf + avpkt->size - info_offset,
0, FF_INPUT_BUFFER_PADDING_SIZE);
init_get_bits(&gb, ctx->swapped_buf, (avpkt->size - info_offset) * 8);
/*