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

LibGfx+BMP: Remove set_remaining, fix size check

Browse source 
The set_remaining method is inherently dangerous. It can be avoided easily here,
so let's do that.
This commit is contained in:
Ben Wiederhake 2020-12-01 22:51:05 +01:00 • committed by Andreas Kling
parent 36daeee34f
commit 453c63fd04
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibGfx/BMPLoader.cpp
View file

@ -256,7 +256,6 @@ public:
bool has_u32() const { return m_size_remaining >= 4; } bool has_u32() const { return m_size_remaining >= 4; }
size_t remaining() const { return m_size_remaining; } size_t remaining() const { return m_size_remaining; }
void set_remaining(size_t remaining) { m_size_remaining = remaining; }
private: private:
const u8* m_data_ptr { nullptr }; const u8* m_data_ptr { nullptr };
@ -445,10 +444,12 @@ static bool set_dib_bitmasks(BMPLoadingContext& context, Streamer& streamer)
} else if (type == DIBType::Info && (compression == Compression::BITFIELDS || compression == Compression::ALPHABITFIELDS)) { } else if (type == DIBType::Info && (compression == Compression::BITFIELDS || compression == Compression::ALPHABITFIELDS)) {
// Consume the extra BITFIELDS bytes // Consume the extra BITFIELDS bytes
auto number_of_mask_fields = compression == Compression::ALPHABITFIELDS ? 4 : 3; auto number_of_mask_fields = compression == Compression::ALPHABITFIELDS ? 4 : 3;
streamer.set_remaining(number_of_mask_fields * 4);
for (auto i = 0; i < number_of_mask_fields; i++) for (auto i = 0; i < number_of_mask_fields; i++) {
if (!streamer.has_u32())
return false;
context.dib.info.masks.append(streamer.read_u32()); context.dib.info.masks.append(streamer.read_u32());
}
populate_dib_mask_info(context); populate_dib_mask_info(context);
} else if (type >= DIBType::V2 && compression == Compression::BITFIELDS) { } else if (type >= DIBType::V2 && compression == Compression::BITFIELDS) {
@ -780,7 +781,7 @@ static bool decode_bmp_dib(BMPLoadingContext& context)
return false; return false;
} }
streamer.set_remaining(dib_size - 4); streamer = Streamer(context.file_bytes + bmp_header_size + 4, context.data_offset - bmp_header_size - 4);
IF_BMP_DEBUG(dbg() << "BMP dib size: " << dib_size); IF_BMP_DEBUG(dbg() << "BMP dib size: " << dib_size);