On Mon, Nov 07, 2011 at 02:38:59PM -0500, Justin Ruggles wrote:
> ---
> libavcodec/mace.c | 11 +++++++----
> 1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/mace.c b/libavcodec/mace.c
> index 5e870a2..a55a041 100644
> --- a/libavcodec/mace.c
> +++ b/libavcodec/mace.c
> @@ -243,11 +243,14 @@ static int mace_decode_frame(AVCodecContext *avctx,
> int16_t *samples = data;
> MACEContext *ctx = avctx->priv_data;
> int i, j, k, l;
> + int out_size;
> int is_mace3 = (avctx->codec_id == CODEC_ID_MACE3);
>
> - if (*data_size < (3 * buf_size << (2-is_mace3))) {
> - av_log(avctx, AV_LOG_ERROR, "Output buffer too small!\n");
> - return -1;
> + out_size = 3 * (buf_size << (1 - is_mace3)) *
> + av_get_bytes_per_sample(avctx->sample_fmt);
> + if (*data_size < out_size) {
> + av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
> + return AVERROR(EINVAL);
> }
>
> for(i = 0; i < avctx->channels; i++) {
> @@ -274,7 +277,7 @@ static int mace_decode_frame(AVCodecContext *avctx,
> }
> }
>
> - *data_size = 3 * buf_size << (2-is_mace3);
> + *data_size = out_size;
>
> return buf_size;
> }
> --
looks OK
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
