LibGfx/PortableFormat: Make `read_whitespace` return an `ErrorOr`

3 files changed, 22 insertions, 18 deletions

diff --git a/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
index 2ee82006b8..c602967b83 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
@@ -39,7 +39,7 @@ bool read_image_data(PGMLoadingContext& context, Streamer& streamer)
                 break;
             auto value = number_or_error.value();
 
-            if (!read_whitespace(context, streamer))
+            if (read_whitespace(context, streamer).is_error())
                 break;
 
             color_data.append({ (u8)value, (u8)value, (u8)value });
diff --git a/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
index c8859350af..7113a3aaa0 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
@@ -27,21 +27,21 @@ bool read_image_data(PPMLoadingContext& context, Streamer& streamer)
             if (red_or_error.is_error())
                 break;
 
-            if (!read_whitespace(context, streamer))
+            if (read_whitespace(context, streamer).is_error())
                 break;
 
             auto const green_or_error = read_number(streamer);
             if (green_or_error.is_error())
                 break;
 
-            if (!read_whitespace(context, streamer))
+            if (read_whitespace(context, streamer).is_error())
                 break;
 
             auto const blue_or_error = read_number(streamer);
             if (blue_or_error.is_error())
                 break;
 
-            if (!read_whitespace(context, streamer))
+            if (read_whitespace(context, streamer).is_error())
                 break;
 
             Color color { (u8)red_or_error.value(), (u8)green_or_error.value(), (u8)blue_or_error.value() };
diff --git a/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
index fe9dacc711..0126543637 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
@@ -109,25 +109,29 @@ static bool read_magic_number(TContext& context, Streamer& streamer)
 }
 
 template<typename TContext>
-static bool read_whitespace(TContext& context, Streamer& streamer)
+static ErrorOr<void> read_whitespace(TContext& context, Streamer& streamer)
 {
-    bool exist = false;
+    bool is_first_char = true;
     u8 byte {};
 
     while (streamer.read(byte)) {
-        if (byte == ' ' || byte == '\t' || byte == '\n' || byte == '\r') {
-            exist = true;
-        } else if (byte == '#') {
+        if (byte == '#') {
             streamer.step_back();
-            if (read_comment(context, streamer).is_error())
-                return false;
-        } else {
+            TRY(read_comment(context, streamer));
+            continue;
+        }
+        if (byte != ' ' && byte != '\t' && byte != '\n' && byte != '\r') {
             streamer.step_back();
-            return exist;
+            if (is_first_char)
+                return Error::from_string_literal("Can't read whitespace from stream");
+            break;
         }
+
+        if (is_first_char)
+            is_first_char = false;
     }
 
-    return exist;
+    return {};
 }
 
 template<typename TContext>
@@ -212,13 +216,13 @@ static bool decode(TContext& context)
     if (!read_magic_number(context, streamer))
         return false;
 
-    if (!read_whitespace(context, streamer))
+    if (read_whitespace(context, streamer).is_error())
         return false;
 
     if (!read_width(context, streamer))
         return false;
 
-    if (!read_whitespace(context, streamer))
+    if (read_whitespace(context, streamer).is_error())
         return false;
 
     if (!read_height(context, streamer))
@@ -229,14 +233,14 @@ static bool decode(TContext& context)
         return false;
     }
 
-    if (!read_whitespace(context, streamer))
+    if (read_whitespace(context, streamer).is_error())
         return false;
 
     if constexpr (requires { context.format_details.max_val; }) {
         if (!read_max_val(context, streamer))
             return false;
 
-        if (!read_whitespace(context, streamer))
+        if (read_whitespace(context, streamer).is_error())
             return false;
     }