Browse Source

ape_decode_value_3860: check k before using it in get_bits()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
60ab448042
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/apedec.c

+ 5
- 2
libavcodec/apedec.c View File

@@ -489,9 +489,12 @@ static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,

if (!rice->k)
x = overflow;
else
else if(rice->k <= MIN_CACHE_BITS) {
x = (overflow << rice->k) + get_bits(gb, rice->k);

} else {
av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %d\n", rice->k);
return AVERROR_INVALIDDATA;
}
rice->ksum += x - (rice->ksum + 8 >> 4);
if (rice->ksum < (rice->k ? 1 << (rice->k + 4) : 0))
rice->k--;


Loading…
Cancel
Save