From b189c88ec212295d711224ded067c6f5771244c1 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Thu, 11 Nov 2021 22:22:32 +0100
Subject: [PATCH] Fuzzers: Use ImageDecoders instead of
 load_FORMAT_from_memory() wrappers

---
 Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzICOLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzJPGLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp | 3 ++-
 Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
index 8906d0f5322..60c6c9d5db6 100644
--- a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
@@ -9,6 +9,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_bmp_from_memory(data, size);
+    Gfx::BMPImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
index 26c0a26e992..ae1caa1ecff 100644
--- a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_ico_from_memory(data, size);
+    Gfx::ICOImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzJPGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzJPGLoader.cpp
index ece17d3da82..106049be921 100644
--- a/Meta/Lagom/Fuzzers/FuzzJPGLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzJPGLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_jpg_from_memory(data, size);
+    Gfx::JPGImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
index 31bfd6fa4ef..1074fbcdd8a 100644
--- a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_pbm_from_memory(data, size);
+    Gfx::PBMImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
index f7794c57420..fd5c64ae790 100644
--- a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_pgm_from_memory(data, size);
+    Gfx::PGMImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
index 1d6e96a0914..8ea01c17a71 100644
--- a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_png_from_memory(data, size);
+    Gfx::PNGImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }
diff --git a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
index dd0108cc87f..211b059ad19 100644
--- a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
@@ -10,6 +10,7 @@
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    Gfx::load_ppm_from_memory(data, size);
+    Gfx::PPMImageDecoderPlugin decoder(data, size);
+    (void)decoder.bitmap();
     return 0;
 }