| Message ID | 20170516002237.8525-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 5666b95c9f27efa6f9b1e1bb6c592b9a8d78bca5 |
| Headers | show |
On 5/16/17, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: 1615/clusterfuzz-testcase-minimized-6625214647500800 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/scpr.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > lgtm
On Tue, May 16, 2017 at 07:57:45AM +0200, Paul B Mahol wrote: > On 5/16/17, Michael Niedermayer <michael@niedermayer.cc> wrote: > > Fixes: 1615/clusterfuzz-testcase-minimized-6625214647500800 > > > > Found-by: continuous fuzzing process > > https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/scpr.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > lgtm applied thx [...]
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 46f072c757..f6d1e45692 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -488,7 +488,7 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize) if (avctx->bits_per_coded_sample == 16) { cx1 = (clr & 0x3F00) >> 2; - cx = (clr & 0xFFFFFF) >> 16; + cx = (clr & 0x3FFFFF) >> 16; } else { cx1 = (clr & 0xFC00) >> 4; cx = (clr & 0xFFFFFF) >> 18; @@ -726,7 +726,7 @@ static int decompress_p(AVCodecContext *avctx, if (avctx->bits_per_coded_sample == 16) { cx1 = (clr & 0x3F00) >> 2; - cx = (clr & 0xFFFFFF) >> 16; + cx = (clr & 0x3FFFFF) >> 16; } else { cx1 = (clr & 0xFC00) >> 4; cx = (clr & 0xFFFFFF) >> 18;
Fixes: 1615/clusterfuzz-testcase-minimized-6625214647500800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/scpr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)