highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/xsubdec: fix overflow in alpha handling

Browse Source 
Fixes: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 18368/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XSUB_fuzzer-5702665442426880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9ea997395909907f569787d4ba5b96352ad31a80)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-10-23 22:08:37 +02:00
parent a2e727398e
commit 1befb7d6ee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/xsubdec.c
View File

@ -130,7 +130,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
((uint32_t *)sub->rects[0]->data[1])[i] |= 0xff000000; ((uint32_t *)sub->rects[0]->data[1])[i] |= 0xff000000;
} else { } else {
for (i = 0; i < sub->rects[0]->nb_colors; i++) for (i = 0; i < sub->rects[0]->nb_colors; i++)
((uint32_t *)sub->rects[0]->data[1])[i] |= *buf++ << 24; ((uint32_t *)sub->rects[0]->data[1])[i] |= (unsigned)*buf++ << 24;
} }
#if FF_API_AVPICTURE #if FF_API_AVPICTURE