beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibGfx: Return stream errors when reading a marker in JPGLoader

Browse source
This commit is contained in:
Karol Kosek 2023-01-21 00:55:56 +01:00 committed by Andreas Kling
parent a9eea2e0c4
commit c39d3c30b7
Notes: sideshowbarker 2024-07-17 23:02:37 +09:00 
Author: https://github.com/krkk
Commit: https://github.com/SerenityOS/serenity/commit/c39d3c30b7
Pull-request: https://github.com/SerenityOS/serenity/pull/17118
Reviewed-by: https://github.com/nico
Reviewed-by: https://github.com/timschumi ✅
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGfx/JPGLoader.cpp
View file

@ -455,12 +455,9 @@ static inline ErrorOr<u16> read_be_word(InputMemoryStream& stream)
return tmp;
}
static inline Marker read_marker_at_cursor(InputMemoryStream& stream)
static inline ErrorOr<Marker> read_marker_at_cursor(InputMemoryStream& stream)
{
auto result = read_be_word(stream);
if (result.is_error())
return JPG_INVALID;
u16 marker = result.release_value();
auto marker = TRY(read_be_word(stream));
if (is_valid_marker(marker))
return marker;
if (marker != 0xFFFF)
@ -468,7 +465,8 @@ static inline Marker read_marker_at_cursor(InputMemoryStream& stream)
u8 next;
do {
stream >> next;
if (stream.handle_any_error() || next == 0x00)
TRY(stream.try_handle_any_error());
if (next == 0x00)
return JPG_INVALID;
} while (next == 0xFF);
marker = 0xFF00 | (u16)next;
@ -1030,15 +1028,13 @@ static ErrorOr<void> compose_bitmap(JPGLoadingContext& context, Vector<Macrobloc
static ErrorOr<void> parse_header(InputMemoryStream& stream, JPGLoadingContext& context)
{
auto marker = read_marker_at_cursor(stream);
TRY(stream.try_handle_any_error());
auto marker = TRY(read_marker_at_cursor(stream));
if (marker != JPG_SOI) {
dbgln_if(JPG_DEBUG, "{}: SOI not found: {:x}!", stream.offset(), marker);
return Error::from_string_literal("SOI not found");
}
for (;;) {
marker = read_marker_at_cursor(stream);
TRY(stream.try_handle_any_error());
marker = TRY(read_marker_at_cursor(stream));
// Set frame type if the marker marks a new frame.
if (marker >= 0xFFC0 && marker <= 0xFFCF) {