RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:37:45 +00:00
Code Issues Activity Actions

LibGfx: Fix serializing Gfx::Bitmaps

Browse source 
a396bb0 removed the palette field but did not update the allocation size
in `Bitmap::serialize_to_byte_buffer()`. This led to a few crashes (I
noticed this from a drag/drop crash in the file manager).

Fixes #21434
This commit is contained in:
MacDue 2023-10-15 19:25:35 +01:00 • committed by Andreas Kling
parent f0cd7adaf8
commit 95bf6ddb8e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tests/LibGfx/TestGfxBitmap.cpp
View file

@ -126,3 +126,12 @@ TEST_CASE(0008_bitmap_downscaling_height1)
} }
} }
} }
TEST_CASE(0009_serialize_and_deserialize_roundtrip)
{
auto original_bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, Gfx::IntSize { 10, 10 }));
original_bitmap->fill(Gfx::Color::Red);
auto bytes = MUST(original_bitmap->serialize_to_byte_buffer());
auto bitmap = MUST(Gfx::Bitmap::create_from_serialized_bytes(bytes));
EXPECT(bitmap->visually_equals(original_bitmap));
}

2
Userland/Libraries/LibGfx/Bitmap.cpp
View file

@ -237,7 +237,7 @@ ErrorOr<NonnullRefPtr<Bitmap>> Bitmap::create_from_serialized_bytes(ReadonlyByte
ErrorOr<ByteBuffer> Bitmap::serialize_to_byte_buffer() const ErrorOr<ByteBuffer> Bitmap::serialize_to_byte_buffer() const
{ {
auto buffer = TRY(ByteBuffer::create_uninitialized(sizeof(size_t) + 4 * sizeof(unsigned) + sizeof(BitmapFormat) + size_in_bytes())); auto buffer = TRY(ByteBuffer::create_uninitialized(sizeof(size_t) + 3 * sizeof(unsigned) + sizeof(BitmapFormat) + size_in_bytes()));
FixedMemoryStream stream { buffer.span() }; FixedMemoryStream stream { buffer.span() };
TRY(stream.write_value(size_in_bytes())); TRY(stream.write_value(size_in_bytes()));