ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/flicvideo: Make line_packets int

Browse Source 
Fixes: signed integer overflow: -32768 * 196032 cannot be represented in type 'int'
Fixes: 15300/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-5733319519502336

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 54bd47f861)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-06-21 23:01:04 +02:00
parent 45a306e4c4
commit d36bc33bcc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/flicvideo.c
View File

@ -178,7 +178,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
int lines;
int compressed_lines;
int starting_line;
signed short line_packets;
int line_packets;
int y_ptr;
int byte_run;
int pixel_skip;
@ -277,7 +277,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
break;
if (y_ptr > pixel_limit)
return AVERROR_INVALIDDATA;
line_packets = bytestream2_get_le16(&g2);
line_packets = sign_extend(bytestream2_get_le16(&g2), 16);
if ((line_packets & 0xC000) == 0xC000) {
// line skip opcode
line_packets = -line_packets;
@ -505,7 +505,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
int lines;
int compressed_lines;
signed short line_packets;
int line_packets;
int y_ptr;
int byte_run;
int pixel_skip;
@ -569,7 +569,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
break;
if (y_ptr > pixel_limit)
return AVERROR_INVALIDDATA;
line_packets = bytestream2_get_le16(&g2);
line_packets = sign_extend(bytestream2_get_le16(&g2), 16);
if (line_packets < 0) {
line_packets = -line_packets;
if (line_packets > s->avctx->height)