From 74f893e9f41e4aa703afa8b47d816e217e908b4e Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sun, 12 Mar 2023 20:59:42 -0400 Subject: [PATCH] LibGfx/PortableFormat: Make `read_comment` return an `ErrorOr` --- .../LibGfx/ImageFormats/PortableImageLoaderCommon.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h index f9b65b67e9..fe9dacc711 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h @@ -53,7 +53,7 @@ static inline ErrorOr read_number(Streamer& streamer) } template -static bool read_comment([[maybe_unused]] TContext& context, Streamer& streamer) +static ErrorOr read_comment([[maybe_unused]] TContext& context, Streamer& streamer) { bool is_first_char = true; u8 byte {}; @@ -61,14 +61,14 @@ static bool read_comment([[maybe_unused]] TContext& context, Streamer& streamer) while (streamer.read(byte)) { if (is_first_char) { if (byte != '#') - return false; + return Error::from_string_literal("Can't read comment from stream"); is_first_char = false; } else if (byte == '\t' || byte == '\n') { break; } } - return true; + return {}; } template @@ -119,7 +119,8 @@ static bool read_whitespace(TContext& context, Streamer& streamer) exist = true; } else if (byte == '#') { streamer.step_back(); - read_comment(context, streamer); + if (read_comment(context, streamer).is_error()) + return false; } else { streamer.step_back(); return exist;