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

LibGfx: Avoid ByteBuffer assertions for huge bitmaps

Browse source
This commit is contained in:
Ben Wiederhake 2020-12-01 19:37:56 +01:00 • committed by Andreas Kling
parent d6c0776b45
commit 9ff001c4d3
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibGfx/BMPLoader.cpp
View file

@ -942,11 +942,20 @@ static bool uncompress_bmp_rle_data(BMPLoadingContext& context, ByteBuffer& buff
auto currently_consuming = RLEState::PixelCount; auto currently_consuming = RLEState::PixelCount;
i16 pixel_count = 0; i16 pixel_count = 0;
// ByteBuffer asserts that allocating the memory never fails.
// FIXME: ByteBuffer should return either RefPtr<> or Optional<>.
// Decoding the RLE data on-the-fly might actually be faster, and avoids this topic entirely.
u32 buffer_size;
if (compression == Compression::RLE24) { if (compression == Compression::RLE24) {
buffer = ByteBuffer::create_zeroed(total_rows * round_up_to_power_of_two(total_columns, 4) * 4); buffer_size = total_rows * round_up_to_power_of_two(total_columns, 4) * 4;
} else { } else {
buffer = ByteBuffer::create_zeroed(total_rows * round_up_to_power_of_two(total_columns, 4)); buffer_size = total_rows * round_up_to_power_of_two(total_columns, 4);
} }
if (buffer_size > 300 * MiB) {
IF_BMP_DEBUG(dbg() << "Suspiciously large amount of RLE data");
return false;
}
buffer = ByteBuffer::create_zeroed(buffer_size);
// Avoid as many if statements as possible by pulling out // Avoid as many if statements as possible by pulling out
// compression-dependent actions into separate lambdas // compression-dependent actions into separate lambdas