Message ID | 20201002125915.17281-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 3291d994b76db4b6e67c8467367ce68f79785e60 |
Headers | show |
Series | [FFmpeg-devel,1/3] avcodec/dxtory: Fix negative stride shift in dx2_decode_slice_420() | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On Fri, Oct 02, 2020 at 02:59:13PM +0200, Michael Niedermayer wrote: > Fixes: left shift of negative value -640 > Fixes: 26044/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5631057602543616 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/dxtory.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > lgtm
On Fri, Oct 02, 2020 at 04:26:58PM +0200, Paul B Mahol wrote: > On Fri, Oct 02, 2020 at 02:59:13PM +0200, Michael Niedermayer wrote: > > Fixes: left shift of negative value -640 > > Fixes: 26044/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5631057602543616 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/dxtory.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > lgtm will apply thx [...]
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index bc95e0e7e1..7143a11e2e 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -717,7 +717,7 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; } - Y += ystride << 1; + Y += ystride * 2; U += ustride; V += vstride; }
Fixes: left shift of negative value -640 Fixes: 26044/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-5631057602543616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/dxtory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)