Commit d5128fce authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/apedec: more checks for k

Fixes assertion failure
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent d9463340
...@@ -603,10 +603,14 @@ static void decode_array_0000(APEContext *ctx, GetBitContext *gb, ...@@ -603,10 +603,14 @@ static void decode_array_0000(APEContext *ctx, GetBitContext *gb,
rice->ksum += out[i]; rice->ksum += out[i];
} }
rice->k = av_log2(rice->ksum / 10) + 1; rice->k = av_log2(rice->ksum / 10) + 1;
if (rice->k >= 24)
return;
for (; i < 64; i++) { for (; i < 64; i++) {
out[i] = get_rice_ook(&ctx->gb, rice->k); out[i] = get_rice_ook(&ctx->gb, rice->k);
rice->ksum += out[i]; rice->ksum += out[i];
rice->k = av_log2(rice->ksum / ((i + 1) * 2)) + 1; rice->k = av_log2(rice->ksum / ((i + 1) * 2)) + 1;
if (rice->k >= 24)
return;
} }
ksummax = 1 << rice->k + 7; ksummax = 1 << rice->k + 7;
ksummin = rice->k ? (1 << rice->k + 6) : 0; ksummin = rice->k ? (1 << rice->k + 6) : 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment