diff mbox

[FFmpeg-devel,2/8] tools/target_dec_fuzzer: adjust pixel threshold for MSRLE, as it allows coding gigantic images on tiny input

Message ID 20190812191708.22608-2-michael@niedermayer.cc
State Accepted
Commit df7e79a5c31efa5bd8ced01d7145ca6fc1dc1bc3
Headers show

Commit Message

Michael Niedermayer Aug. 12, 2019, 7:17 p.m. UTC
Fixes: Timeout (12sec ->2sec)
Fixes: 16125/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSRLE_fuzzer-5650846364205056

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Paul B Mahol Aug. 14, 2019, 5:02 p.m. UTC | #1
lgtm

On Mon, Aug 12, 2019 at 9:19 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Fixes: Timeout (12sec ->2sec)
> Fixes:
> 16125/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSRLE_fuzzer-5650846364205056
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael@niedermayer.cc>
> ---
>  tools/target_dec_fuzzer.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> index e6eed88781..d83039417c 100644
> --- a/tools/target_dec_fuzzer.c
> +++ b/tools/target_dec_fuzzer.c
> @@ -170,6 +170,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
> size) {
>      maxpixels = maxpixels_per_frame * maxiteration;
>      switch (c->id) {
>          // Allows a small input to generate gigantic output
> +    case AV_CODEC_ID_MSRLE:     maxpixels /= 16;  break;
>      case AV_CODEC_ID_QTRLE:     maxpixels /= 16;  break;
>      case AV_CODEC_ID_GIF:       maxpixels /= 16;  break;
>          // Performs slow frame rescaling in C
> --
> 2.22.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer Aug. 14, 2019, 5:34 p.m. UTC | #2
On Wed, Aug 14, 2019 at 07:02:29PM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox

Patch

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index e6eed88781..d83039417c 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -170,6 +170,7 @@  int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     maxpixels = maxpixels_per_frame * maxiteration;
     switch (c->id) {
         // Allows a small input to generate gigantic output
+    case AV_CODEC_ID_MSRLE:     maxpixels /= 16;  break;
     case AV_CODEC_ID_QTRLE:     maxpixels /= 16;  break;
     case AV_CODEC_ID_GIF:       maxpixels /= 16;  break;
         // Performs slow frame rescaling in C