virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/wavpack: fix regression in decoding

Browse Source 
Regression introduced in c6831e2a70.
Fix it by using bitreader that reads 0-32 bits, instead of
0-25 bits and asserting on anything higher.
This commit is contained in:
Paul B Mahol 2022-08-23 22:39:41 +02:00
parent b347a05f1f
commit 9bf9d42d01
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/wavpack.c
View File

@ -119,7 +119,7 @@ typedef struct WavpackContext {
#define LEVEL_DECAY(a) (((a) + 0x80) >> 8)
static av_always_inline unsigned get_tail(GetBitContext *gb, int k)
static av_always_inline unsigned get_tail(GetBitContext *gb, unsigned k)
{
int p, e, res;
@ -127,7 +127,7 @@ static av_always_inline unsigned get_tail(GetBitContext *gb, int k)
return 0;
p = av_log2(k);
e = (1 << (p + 1)) - k - 1;
res = get_bitsz(gb, p);
res = get_bits_long(gb, p);
if (res >= e)
res = (res << 1) - e + get_bits1(gb);
return res;
@ -266,10 +266,6 @@ static int wv_get_value(WavpackFrameContext *ctx, GetBitContext *gb,
INC_MED(2);
}
if (!c->error_limit) {
if (add >= 0x2000000U) {
av_log(ctx->avctx, AV_LOG_ERROR, "k %d is too large\n", add);
goto error;
}
ret = base + get_tail(gb, add);
if (get_bits_left(gb) <= 0)
goto error;