| Message ID | 20230502153820.32234-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | b168aeb734069b09ab174666169f9c5dd631fb1b |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/rka: avoid undefined multiply in cmode==0 | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
approved
On Tue, May 02, 2023 at 05:39:27PM +0200, Paul B Mahol wrote:
> approved
will apply
thx
[...]
On Tue, May 02, 2023 at 05:38:18PM +0200, Michael Niedermayer wrote: > Fixes: signed integer overflow: -182838 * 32768 cannot be represented in type 'int' > Fixes: 58179/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5333265899978752 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/rka.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply teh remaining patches of this set [...]
diff --git a/libavcodec/rka.c b/libavcodec/rka.c index 3e86d83819..e4a70f5557 100644 --- a/libavcodec/rka.c +++ b/libavcodec/rka.c @@ -732,7 +732,7 @@ static int decode_filter(RKAContext *s, ChContext *ctx, ACoder *ac, int off, uns if (bits == 0) { ctx->buf1[off] = sum + val; } else { - ctx->buf1[off] = (val + (sum >> bits)) * (1 << bits) + + ctx->buf1[off] = (val + (sum >> bits)) * (1U << bits) + (((1U << bits) - 1U) & ctx->buf1[off + -1]); } ctx->buf0[off] = ctx->buf1[off] + ctx->buf0[off + -1];
Fixes: signed integer overflow: -182838 * 32768 cannot be represented in type 'int' Fixes: 58179/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5333265899978752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/rka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)