| Message ID | 20200925222638.23675-3-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | abebd87764992dc22c82802bdc75d40aac14ab86 |
| Headers | show |
| Series | [FFmpeg-devel,1/6] avcodec/dxtory: Fix get_raw_size() for YUV | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Sat, Sep 26, 2020 at 12:26:35AM +0200, Michael Niedermayer wrote: > Fixes: left shift of negative value -768 > Fixes: 25574/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-6012596027916288 > > 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 > > diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c > index a82532c467..bc95e0e7e1 100644 > --- a/libavcodec/dxtory.c > +++ b/libavcodec/dxtory.c > @@ -637,7 +637,7 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, > V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; > } > > - Y += ystride << 2; > + Y += ystride * 4; > U += ustride; > V += vstride; > } > -- > 2.17.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Sat, Sep 26, 2020 at 09:40:43AM +0200, Paul B Mahol wrote: > On Sat, Sep 26, 2020 at 12:26:35AM +0200, Michael Niedermayer wrote: > > Fixes: left shift of negative value -768 > > Fixes: 25574/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-6012596027916288 > > > > 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 a82532c467..bc95e0e7e1 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -637,7 +637,7 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; } - Y += ystride << 2; + Y += ystride * 4; U += ustride; V += vstride; }
Fixes: left shift of negative value -768 Fixes: 25574/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXTORY_fuzzer-6012596027916288 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(-)