From 4d7ba50dc7d735c4e8e2568a9cf8dc1eb7b08de0 Mon Sep 17 00:00:00 2001 From: devashish Date: Sun, 29 Nov 2020 17:07:43 +0530 Subject: [PATCH] JPGLoader: Move bogus JPEGs to a different directory --- Base/res/html/misc/jpg.html | 2 -- .../{offending-3439.jpg => fuzz/issue-3439.jpg} | Bin .../html/misc/jpgsuite_files/fuzz/issue-4212.jpg | Bin 0 -> 71 bytes .../html/misc/jpgsuite_files/fuzz/issue-4214.jpg | Bin 0 -> 254 bytes .../html/misc/jpgsuite_files/fuzz/issue-4215.jpg | Bin 0 -> 229 bytes Libraries/LibGfx/JPGLoader.cpp | 3 +-- 6 files changed, 1 insertion(+), 4 deletions(-) rename Base/res/html/misc/jpgsuite_files/{offending-3439.jpg => fuzz/issue-3439.jpg} (100%) create mode 100644 Base/res/html/misc/jpgsuite_files/fuzz/issue-4212.jpg create mode 100644 Base/res/html/misc/jpgsuite_files/fuzz/issue-4214.jpg create mode 100644 Base/res/html/misc/jpgsuite_files/fuzz/issue-4215.jpg diff --git a/Base/res/html/misc/jpg.html b/Base/res/html/misc/jpg.html index 2f684fa721..11f199eabc 100644 --- a/Base/res/html/misc/jpg.html +++ b/Base/res/html/misc/jpg.html @@ -6,8 +6,6 @@
-

Issue-3439

- lena

Non-subsampled Lena


lena

Chroma Horizontally Halved Lena


diff --git a/Base/res/html/misc/jpgsuite_files/offending-3439.jpg b/Base/res/html/misc/jpgsuite_files/fuzz/issue-3439.jpg similarity index 100% rename from Base/res/html/misc/jpgsuite_files/offending-3439.jpg rename to Base/res/html/misc/jpgsuite_files/fuzz/issue-3439.jpg diff --git a/Base/res/html/misc/jpgsuite_files/fuzz/issue-4212.jpg b/Base/res/html/misc/jpgsuite_files/fuzz/issue-4212.jpg new file mode 100644 index 0000000000000000000000000000000000000000..43ef73d650cf2a430423a9f1b32aead6899eb28b GIT binary patch literal 71 zcmex=kJHx3=qH$rWh4q0L(=uU<#4NP}u^gT(WqANV>o_DnJDkz&sEK=0Z&R m|9=IA|Nj;KA7D`605O;ulo%lB|1Ab4W{_qE1_pbE|2F}eJr*7S literal 0 HcmV?d00001 diff --git a/Base/res/html/misc/jpgsuite_files/fuzz/issue-4215.jpg b/Base/res/html/misc/jpgsuite_files/fuzz/issue-4215.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0075a91d17eb49d8dc47e9f6e693ae0568a658fc GIT binary patch literal 229 zcmex=5{2jYN56%;^B7zQf`i^D|V tE&z)vC?jv82|tP literal 0 HcmV?d00001 diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp index ee2bfeb001..4b956a9d2c 100644 --- a/Libraries/LibGfx/JPGLoader.cpp +++ b/Libraries/LibGfx/JPGLoader.cpp @@ -36,7 +36,7 @@ #include #include -#define JPG_DEBUG +//#define JPG_DEBUG #define JPG_INVALID 0X0000 @@ -209,7 +209,6 @@ struct JPGLoadingContext { u8 vsample_factor { 0 }; u8 component_count { 0 }; HashMap components; - // ComponentSpec components[3]; RefPtr bitmap; u16 dc_reset_interval { 0 }; Vector dc_tables;