generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wavpackenc: proper buffer allocation

Browse Source 
The allocation didn't account for headers, that can be easily 79 bytes.
As a result, buffers allocated for a few samples (e.g. 5 in the original
bug) could be undersized.

Fixed ticket #2881.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2014-08-19 12:26:49 +00:00 committed by Michael Niedermayer
parent 11a39bdf53
commit 2ba58bec20
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wavpackenc.c
View File

@ -2876,10 +2876,11 @@ static int wavpack_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if ((ret = ff_alloc_packet2(avctx, avpkt, s->block_samples * avctx->channels * 8)) < 0) buf_size = s->block_samples * avctx->channels * 8
+ 200 /* for headers */;
if ((ret = ff_alloc_packet2(avctx, avpkt, buf_size)) < 0)
return ret; return ret;
buf = avpkt->data; buf = avpkt->data;
buf_size = avpkt->size;
for (s->ch_offset = 0; s->ch_offset < avctx->channels;) { for (s->ch_offset = 0; s->ch_offset < avctx->channels;) {
set_samplerate(s); set_samplerate(s);