[FFmpeg-devel] [PATCH 3/3] wavpackenc: proper buffer allocation

Paul B Mahol onemda at gmail.com
Tue Aug 19 14:50:37 CEST 2014


On 8/19/14, Christophe Gisquet <christophe.gisquet at gmail.com> wrote:
> 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.
> ---
>  libavcodec/wavpackenc.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c
> index 46c69a3..3fa2b95 100644
> --- a/libavcodec/wavpackenc.c
> +++ b/libavcodec/wavpackenc.c
> @@ -2881,10 +2881,11 @@ static int wavpack_encode_frame(AVCodecContext
> *avctx, AVPacket *avpkt,
>              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;
>      buf = avpkt->data;
> -    buf_size = avpkt->size;
>
>      for (s->ch_offset = 0; s->ch_offset < avctx->channels;) {
>          set_samplerate(s);
> --
> 1.9.2.msysgit.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

ok

thanks for fixing this bug.


More information about the ffmpeg-devel mailing list