From 95bf6ddb8e3d79849f2ef74c368c2579e69fa1b4 Mon Sep 17 00:00:00 2001
From: MacDue <macdue@dueutil.tech>
Date: Sun, 15 Oct 2023 19:25:35 +0100
Subject: [PATCH] LibGfx: Fix serializing Gfx::Bitmaps

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
---
 Tests/LibGfx/TestGfxBitmap.cpp       | 9 +++++++++
 Userland/Libraries/LibGfx/Bitmap.cpp | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Tests/LibGfx/TestGfxBitmap.cpp b/Tests/LibGfx/TestGfxBitmap.cpp
index 271b7e7f8a4..bd214b9ebf2 100644
--- a/Tests/LibGfx/TestGfxBitmap.cpp
+++ b/Tests/LibGfx/TestGfxBitmap.cpp
@@ -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));
+}
diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp
index d76dead8242..9d3499ea156 100644
--- a/Userland/Libraries/LibGfx/Bitmap.cpp
+++ b/Userland/Libraries/LibGfx/Bitmap.cpp
@@ -237,7 +237,7 @@ ErrorOr<NonnullRefPtr<Bitmap>> Bitmap::create_from_serialized_bytes(ReadonlyByte
 
 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() };
 
     TRY(stream.write_value(size_in_bytes()));