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 zcmZ?s5AtPTkWcdTaq@NY^>ATeU=U$+U^v0Rz`(%Fz}UdRpko5!JNr5YFfcGkoH=ub zfq~)w|Nk8w9jlZW?uIhF+s(kx!QkxZ>(0Qyz{0>Nz~B<#sQ_l1Fz7h>yF@ZD$TQt! zU}R|c-NCTp^(ux}zuz(b`;X4Q$?%PV!QrmEY zm!R-LE*TtQ@{fU`{_}r^KW`YA88|u`J~J>deT9V%rpP}A28YiK3@mRzF$M}2NAz$) z2q4t{V_-%JA51>X)GrLIpl}Ke{EG-VbP zr8lr^VJVIkO$1>sdRjy0BUFB4U>FTs2K12pf+2zkG4!xR=Oa{(hV2^$%#g$sL4+83 zSfcY0Do4Y1G;HCu1E@Yn6t5TsFe24pmapjb{AhU#YGc4c0V60e1V+Oa)aF8j0(!du zosUq75tJAL2(_c>7Ss+z4@-1DBD^qy5<>u?b~J29!xmDLVD=Tz`x3BnakTFMN;9Kv zu+cUcB*vooV%0vgvs9qk(plhH8w M_8&aQI&5Zp0n1Q~F#rGn 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) \