diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-06-13 02:01:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-10-09 22:15:46 +0200 |
| commit | b2222721245cfbba2d3f6917f0ab316aaeb76db3 (patch) | |
| tree | 552f7fb32286e0125280f0ecd012268000efa02b | |
| parent | bf29c080b1e03d88fa617acaffc2f7c7a734093d (diff) | |
| download | ffmpeg-b2222721245cfbba2d3f6917f0ab316aaeb76db3.tar.gz | |
avcodec/bink: disallow odd positioned scaled blocks
Fixes: out of array access
Fixes: 47911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6194020855971840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b14104a6376cd774b08cbe5fda56b34320a41b2e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index ca10a0ce81..bc4fe7e163 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1054,7 +1054,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb, for (bx = 0; bx < bw; bx++, dst += 8, prev += 8) { blk = get_value(c, BINK_SRC_BLOCK_TYPES); // 16x16 block type on odd line means part of the already decoded block, so skip it - if ((by & 1) && blk == SCALED_BLOCK) { + if (((by & 1) || (bx & 1)) && blk == SCALED_BLOCK) { bx++; dst += 8; prev += 8; |