Message ID | 20200605204159.23848-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | d7a2311a2c5be1e861c3df618d295e7eced8e84b |
Headers | show |
Series | [FFmpeg-devel,1/2] avcodec/movtextdec: Fix shift overflows in mov_text_init() | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On Fri, Jun 05, 2020 at 10:41:58PM +0200, Michael Niedermayer wrote: > Fixes: left shift of 243 by 24 places cannot be represented in type 'int' > Fixes: 22716/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOVTEXT_fuzzer-5704263425851392 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/movtextdec.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) will apply [...]
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 4b4da5e0d9..4a21dbf36d 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -492,10 +492,10 @@ static int mov_text_init(AVCodecContext *avctx) { return ff_ass_subtitle_header_full(avctx, m->frame_width, m->frame_height, m->d.font, m->d.fontsize, - (255 - m->d.alpha) << 24 | RGB_TO_BGR(m->d.color), - (255 - m->d.alpha) << 24 | RGB_TO_BGR(m->d.color), - (255 - m->d.back_alpha) << 24 | RGB_TO_BGR(m->d.back_color), - (255 - m->d.back_alpha) << 24 | RGB_TO_BGR(m->d.back_color), + (255U - m->d.alpha) << 24 | RGB_TO_BGR(m->d.color), + (255U - m->d.alpha) << 24 | RGB_TO_BGR(m->d.color), + (255U - m->d.back_alpha) << 24 | RGB_TO_BGR(m->d.back_color), + (255U - m->d.back_alpha) << 24 | RGB_TO_BGR(m->d.back_color), m->d.bold, m->d.italic, m->d.underline, ASS_DEFAULT_BORDERSTYLE, m->d.alignment); } else
Fixes: left shift of 243 by 24 places cannot be represented in type 'int' Fixes: 22716/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOVTEXT_fuzzer-5704263425851392 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/movtextdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)