On Fri, Jun 28, 2013 at 06:53:33AM +0200, Luca Barbato wrote:
> Prevent yet another buffer overwrite.
>
> Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
> CC: libav-sta...@libav.org
> ---
> libavcodec/wmaprodec.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
> index 2867b87..4011727 100644
> --- a/libavcodec/wmaprodec.c
> +++ b/libavcodec/wmaprodec.c
> @@ -1119,11 +1119,12 @@ static int decode_subframe(WMAProDecodeCtx *s)
> cur_subwoofer_cutoff = s->subwoofer_cutoffs[s->table_idx];
>
> /** configure the decoder for the current subframe */
> + offset += (s->samples_per_frame >> 1);
useless parentheses
> +
> for (i = 0; i < s->channels_for_cur_subframe; i++) {
> int c = s->channel_indexes_for_cur_subframe[i];
>
> - s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame >> 1)
> - + offset];
> + s->channel[c].coeffs = &s->channel[c].out[offset];
> }
>
> s->subframe_len = subframe_len;
> @@ -1174,7 +1175,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
> for (i = 0; i < s->channels_for_cur_subframe; i++) {
> int c = s->channel_indexes_for_cur_subframe[i];
> int num_vec_coeffs = get_bits(&s->gb, num_bits) << 2;
> - if (num_vec_coeffs > WMAPRO_BLOCK_MAX_SIZE) {
> + if (num_vec_coeffs + offset >
> FF_ARRAY_ELEMS(s->channel[c].out)) {
> av_log(s->avctx, AV_LOG_ERROR, "num_vec_coeffs %d is too
> large\n", num_vec_coeffs);
> return AVERROR_INVALIDDATA;
> }
> --
probably OK
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
