Commit 5a6fc874 authored by Michael Niedermayer's avatar Michael Niedermayer

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

Improves: Timeout (355sec -> 97sec)
Improves: 14709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5704215281795072
Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
parent 710b7ec0
......@@ -308,7 +308,7 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip)
int len;
int b = bytestream2_get_byte(gb);
if (b == 0) {
break;
return 0;
}
if (b != 0xFF) {
len = b;
......@@ -323,6 +323,8 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip)
lz_copy(pb, g2, off, len);
}
}
if (bytestream2_get_bytes_left_p(pb) > 0)
return AVERROR_INVALIDDATA;
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment