har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/gdv: Check remaining output after decode 5/6/8/

Browse Source 
Improves: Timeout (355sec -> 97sec)
Improves: 14709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5704215281795072

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
This commit is contained in:
Michael Niedermayer 2019-05-29 01:12:39 +02:00
parent 710b7ec071
commit 5a6fc87443
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/gdv.c
View File

@ -308,7 +308,7 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip)
int len; int len;
int b = bytestream2_get_byte(gb); int b = bytestream2_get_byte(gb);
if (b == 0) { if (b == 0) {
break; return 0;
} }
if (b != 0xFF) { if (b != 0xFF) {
len = b; len = b;
@ -323,6 +323,8 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip)
lz_copy(pb, g2, off, len); lz_copy(pb, g2, off, len);
} }
} }
if (bytestream2_get_bytes_left_p(pb) > 0)
return AVERROR_INVALIDDATA;
return 0; return 0;
} }
@ -445,6 +447,9 @@ static int decompress_68(AVCodecContext *avctx, unsigned skip, unsigned use8)
} }
} }
if (bytestream2_get_bytes_left_p(pb) > 0)
return AVERROR_INVALIDDATA;
return 0; return 0;
} }