From 0986533c11a4c24f2b1ad7e200b611e523f849e6 Mon Sep 17 00:00:00 2001 From: Nicolas Ramz Date: Thu, 3 Aug 2023 10:52:44 +0200 Subject: [PATCH] Meta+Tests: Add a fuzzer and a test for the ILBM decoder --- Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp | 18 ++++++++++++++++++ Meta/Lagom/Fuzzers/fuzzers.cmake | 2 ++ Tests/LibGfx/TestImageDecoder.cpp | 10 ++++++++++ Tests/LibGfx/test-inputs/ilbm/gradient.iff | Bin 0 -> 8042 bytes Userland/Utilities/test-fuzz.cpp | 1 + 5 files changed, 31 insertions(+) create mode 100644 Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp create mode 100644 Tests/LibGfx/test-inputs/ilbm/gradient.iff diff --git a/Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp new file mode 100644 index 0000000000..a7a21664f8 --- /dev/null +++ b/Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2023, the SerenityOS developers. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) +{ + auto decoder_or_error = Gfx::ILBMImageDecoderPlugin::create({ data, size }); + if (decoder_or_error.is_error()) + return 0; + auto decoder = decoder_or_error.release_value(); + (void)decoder->frame(0); + return 0; +} diff --git a/Meta/Lagom/Fuzzers/fuzzers.cmake b/Meta/Lagom/Fuzzers/fuzzers.cmake index c3218fd661..28d15aceaa 100644 --- a/Meta/Lagom/Fuzzers/fuzzers.cmake +++ b/Meta/Lagom/Fuzzers/fuzzers.cmake @@ -16,6 +16,7 @@ set(FUZZER_TARGETS HttpRequest ICCProfile ICOLoader + ILBMLoader IMAPParser JPEGLoader Js @@ -86,6 +87,7 @@ set(FUZZER_DEPENDENCIES_HebrewDecoder LibTextCodec) set(FUZZER_DEPENDENCIES_HttpRequest LibHTTP) set(FUZZER_DEPENDENCIES_ICCProfile LibGfx) set(FUZZER_DEPENDENCIES_ICOLoader LibGfx) +set(FUZZER_DEPENDENCIES_ILBMLoader LibGfx) set(FUZZER_DEPENDENCIES_IMAPParser LibIMAP) set(FUZZER_DEPENDENCIES_JPEGLoader LibGfx) set(FUZZER_DEPENDENCIES_Js LibJS) diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp index f8706c05f2..bb5a294425 100644 --- a/Tests/LibGfx/TestImageDecoder.cpp +++ b/Tests/LibGfx/TestImageDecoder.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +89,15 @@ TEST_CASE(test_bmp_embedded_in_ico) expect_single_frame(*plugin_decoder); } +TEST_CASE(test_ilbm) +{ + auto file = MUST(Core::MappedFile::map(TEST_INPUT("ilbm/gradient.iff"sv))); + EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes())); + auto plugin_decoder = MUST(Gfx::ILBMImageDecoderPlugin::create(file->bytes())); + + expect_single_frame_of_size(*plugin_decoder, { 320, 200 }); +} + TEST_CASE(test_jpeg_sof0_one_scan) { auto file = MUST(Core::MappedFile::map(TEST_INPUT("jpg/rgb24.jpg"sv))); diff --git a/Tests/LibGfx/test-inputs/ilbm/gradient.iff b/Tests/LibGfx/test-inputs/ilbm/gradient.iff new file mode 100644 index 0000000000000000000000000000000000000000..e187cc716b3b302acccb6878b5ae2d15a658d8b6 GIT binary patch literal 8042 zcmeHMu}&L75Pjz}5+#-rDIMraMClK(jT1oPgo!wz6lwSej zB1A9%HkuZ1#_b-3K8;2rdKhEUG#y5`Ofb!W6r1gMi~gu1SV6b9v*vy`vC-MxNNkxb6O$jrXht1v2rrP>q;L<%$YBC>PdfbfODmo>=?blj4N@Ve4#5_6_% zJE3n`D(Od9F{!1*oT=KXwyzb;?m1inyduG_@oRwGi?k-#eXvx)lhO-tu4-%dQ@M9Z z%zAlJdI8Q=ZB^SvwIe6!8SKsTKYuy&QR(?s&tQvAN6!h`mub)I`hLF)^CMhEWgjLn zXKKCGzD)bFau#<71g|5o3V1)0L!GATgt;&}b=RASIl17iNrU=CeWE_mn@zi8ybLV= Ho7>)J%TSCl literal 0 HcmV?d00001 diff --git a/Userland/Utilities/test-fuzz.cpp b/Userland/Utilities/test-fuzz.cpp index af2d102609..14323dd1da 100644 --- a/Userland/Utilities/test-fuzz.cpp +++ b/Userland/Utilities/test-fuzz.cpp @@ -30,6 +30,7 @@ T(HttpRequest) \ T(ICCProfile) \ T(ICOLoader) \ + T(ILBMLoader) \ T(IMAPParser) \ T(JPEGLoader) \ T(Js) \