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

AK: Remove the fallible constructor from FixedMemoryStream

Browse source
This commit is contained in:
Tim Schumacher 2023-01-30 11:05:43 +01:00 • committed by Linus Groh
parent 8b2f23d016
commit 220fbcaa7e
31 changed files with 185 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

100
Tests/AK/TestLEB128.cpp
View file

@ -14,18 +14,18 @@ TEST_CASE(single_byte)
u32 output = {};
i32 output_signed = {};
u8 buf[] = { 0x00 };
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { buf, sizeof(buf) }));
FixedMemoryStream stream { ReadonlyBytes { buf, sizeof(buf) } };
// less than/eq 0b0011_1111, signed == unsigned == raw byte
for (u8 i = 0u; i <= 0x3F; ++i) {
buf[0] = i;
MUST(stream->seek(0));
output = MUST(stream->read_value<LEB128<u32>>());
MUST(stream.seek(0));
output = MUST(stream.read_value<LEB128<u32>>());
EXPECT_EQ(output, i);
MUST(stream->seek(0));
output_signed = MUST(stream->read_value<LEB128<i32>>());
MUST(stream.seek(0));
output_signed = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(output_signed, i);
}
@ -33,23 +33,23 @@ TEST_CASE(single_byte)
for (u8 i = 0x40u; i < 0x80; ++i) {
buf[0] = i;
MUST(stream->seek(0));
output = MUST(stream->read_value<LEB128<u32>>());
MUST(stream.seek(0));
output = MUST(stream.read_value<LEB128<u32>>());
EXPECT_EQ(output, i);
MUST(stream->seek(0));
output_signed = MUST(stream->read_value<LEB128<i32>>());
MUST(stream.seek(0));
output_signed = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(output_signed, (i | (-1 & (~0x3F))));
}
// MSB set, but input too short
for (u16 i = 0x80; i <= 0xFF; ++i) {
buf[0] = static_cast<u8>(i);
MUST(stream->seek(0));
EXPECT(stream->read_value<LEB128<u32>>().is_error());
MUST(stream.seek(0));
EXPECT(stream.read_value<LEB128<u32>>().is_error());
MUST(stream->seek(0));
EXPECT(stream->read_value<LEB128<i32>>().is_error());
MUST(stream.seek(0));
EXPECT(stream.read_value<LEB128<i32>>().is_error());
}
}
@ -58,7 +58,7 @@ TEST_CASE(two_bytes)
u32 output = {};
i32 output_signed = {};
u8 buf[] = { 0x00, 0x1 };
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { buf, sizeof(buf) }));
FixedMemoryStream stream { ReadonlyBytes { buf, sizeof(buf) } };
// Only test with first byte expecting more, otherwise equivalent to single byte case
for (u16 i = 0x80; i <= 0xFF; ++i) {
@ -68,12 +68,12 @@ TEST_CASE(two_bytes)
for (u8 j = 0u; j <= 0x3F; ++j) {
buf[1] = j;
MUST(stream->seek(0));
output = MUST(stream->read_value<LEB128<u32>>());
MUST(stream.seek(0));
output = MUST(stream.read_value<LEB128<u32>>());
EXPECT_EQ(output, (static_cast<u32>(j) << 7) + (i & 0x7F));
MUST(stream->seek(0));
output_signed = MUST(stream->read_value<LEB128<i32>>());
MUST(stream.seek(0));
output_signed = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(output_signed, (static_cast<i32>(j) << 7) + (i & 0x7F));
}
@ -81,12 +81,12 @@ TEST_CASE(two_bytes)
for (u8 j = 0x40u; j < 0x80; ++j) {
buf[1] = j;
MUST(stream->seek(0));
output = MUST(stream->read_value<LEB128<u32>>());
MUST(stream.seek(0));
output = MUST(stream.read_value<LEB128<u32>>());
EXPECT_EQ(output, (static_cast<u32>(j) << 7) + (i & 0x7F));
MUST(stream->seek(0));
output_signed = MUST(stream->read_value<LEB128<i32>>());
MUST(stream.seek(0));
output_signed = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(output_signed, ((static_cast<i32>(j) << 7) + (i & 0x7F)) | (-1 & (~0x3FFF)));
}
@ -94,11 +94,11 @@ TEST_CASE(two_bytes)
for (u16 j = 0x80; j <= 0xFF; ++j) {
buf[1] = static_cast<u8>(j);
MUST(stream->seek(0));
EXPECT(stream->read_value<LEB128<u32>>().is_error());
MUST(stream.seek(0));
EXPECT(stream.read_value<LEB128<u32>>().is_error());
MUST(stream->seek(0));
EXPECT(stream->read_value<LEB128<i32>>().is_error());
MUST(stream.seek(0));
EXPECT(stream.read_value<LEB128<i32>>().is_error());
}
}
}
@ -107,22 +107,22 @@ TEST_CASE(overflow_sizeof_output_unsigned)
{
u8 u32_max_plus_one[] = { 0x80, 0x80, 0x80, 0x80, 0x10 };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { u32_max_plus_one, sizeof(u32_max_plus_one) }));
EXPECT(stream->read_value<LEB128<u32>>().is_error());
FixedMemoryStream stream { ReadonlyBytes { u32_max_plus_one, sizeof(u32_max_plus_one) } };
EXPECT(stream.read_value<LEB128<u32>>().is_error());
MUST(stream->seek(0));
u64 out64 = MUST(stream->read_value<LEB128<u64>>());
MUST(stream.seek(0));
u64 out64 = MUST(stream.read_value<LEB128<u64>>());
EXPECT_EQ(out64, static_cast<u64>(NumericLimits<u32>::max()) + 1);
}
u8 u32_max[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x0F };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { u32_max, sizeof(u32_max) }));
u32 out = MUST(stream->read_value<LEB128<u32>>());
FixedMemoryStream stream { ReadonlyBytes { u32_max, sizeof(u32_max) } };
u32 out = MUST(stream.read_value<LEB128<u32>>());
EXPECT_EQ(out, NumericLimits<u32>::max());
MUST(stream->seek(0));
u64 out64 = MUST(stream->read_value<LEB128<u64>>());
MUST(stream.seek(0));
u64 out64 = MUST(stream.read_value<LEB128<u64>>());
EXPECT_EQ(out64, NumericLimits<u32>::max());
}
}
@ -131,43 +131,43 @@ TEST_CASE(overflow_sizeof_output_signed)
{
u8 i32_max_plus_one[] = { 0x80, 0x80, 0x80, 0x80, 0x08 };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { i32_max_plus_one, sizeof(i32_max_plus_one) }));
EXPECT(stream->read_value<LEB128<i32>>().is_error());
FixedMemoryStream stream { ReadonlyBytes { i32_max_plus_one, sizeof(i32_max_plus_one) } };
EXPECT(stream.read_value<LEB128<i32>>().is_error());
MUST(stream->seek(0));
i64 out64 = MUST(stream->read_value<LEB128<i64>>());
MUST(stream.seek(0));
i64 out64 = MUST(stream.read_value<LEB128<i64>>());
EXPECT_EQ(out64, static_cast<i64>(NumericLimits<i32>::max()) + 1);
}
u8 i32_max[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x07 };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { i32_max, sizeof(i32_max) }));
i32 out = MUST(stream->read_value<LEB128<i32>>());
FixedMemoryStream stream { ReadonlyBytes { i32_max, sizeof(i32_max) } };
i32 out = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(out, NumericLimits<i32>::max());
MUST(stream->seek(0));
i64 out64 = MUST(stream->read_value<LEB128<i64>>());
MUST(stream.seek(0));
i64 out64 = MUST(stream.read_value<LEB128<i64>>());
EXPECT_EQ(out64, NumericLimits<i32>::max());
}
u8 i32_min_minus_one[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x77 };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { i32_min_minus_one, sizeof(i32_min_minus_one) }));
EXPECT(stream->read_value<LEB128<i32>>().is_error());
FixedMemoryStream stream { ReadonlyBytes { i32_min_minus_one, sizeof(i32_min_minus_one) } };
EXPECT(stream.read_value<LEB128<i32>>().is_error());
MUST(stream->seek(0));
i64 out64 = MUST(stream->read_value<LEB128<i64>>());
MUST(stream.seek(0));
i64 out64 = MUST(stream.read_value<LEB128<i64>>());
EXPECT_EQ(out64, static_cast<i64>(NumericLimits<i32>::min()) - 1);
}
u8 i32_min[] = { 0x80, 0x80, 0x80, 0x80, 0x78 };
{
auto stream = MUST(FixedMemoryStream::construct(ReadonlyBytes { i32_min, sizeof(i32_min) }));
i32 out = MUST(stream->read_value<LEB128<i32>>());
FixedMemoryStream stream { ReadonlyBytes { i32_min, sizeof(i32_min) } };
i32 out = MUST(stream.read_value<LEB128<i32>>());
EXPECT_EQ(out, NumericLimits<i32>::min());
MUST(stream->seek(0));
i64 out64 = MUST(stream->read_value<LEB128<i64>>());
MUST(stream.seek(0));
i64 out64 = MUST(stream.read_value<LEB128<i64>>());
EXPECT_EQ(out64, NumericLimits<i32>::min());
}
}

4
Tests/LibCompress/TestDeflate.cpp
View file

@ -28,7 +28,7 @@ TEST_CASE(canonical_code_simple)
};
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
auto memory_stream = MUST(FixedMemoryStream::construct(input));
auto memory_stream = MUST(try_make<FixedMemoryStream>(input));
LittleEndianInputBitStream bit_stream { move(memory_stream) };
for (size_t idx = 0; idx < 9; ++idx)
@ -48,7 +48,7 @@ TEST_CASE(canonical_code_complex)
};
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
auto memory_stream = MUST(FixedMemoryStream::construct(input));
auto memory_stream = MUST(try_make<FixedMemoryStream>(input));
LittleEndianInputBitStream bit_stream { move(memory_stream) };
for (size_t idx = 0; idx < 12; ++idx)

4
Tests/LibWasm/test-wasm.cpp
View file

@ -106,8 +106,8 @@ TESTJS_GLOBAL_FUNCTION(parse_webassembly_module, parseWebAssemblyModule)
if (!is<JS::Uint8Array>(object))
return vm.throw_completion<JS::TypeError>("Expected a Uint8Array argument to parse_webassembly_module");
auto& array = static_cast<JS::Uint8Array&>(*object);
auto stream = FixedMemoryStream::construct(array.data()).release_value_but_fixme_should_propagate_errors();
auto result = Wasm::Module::parse(*stream);
FixedMemoryStream stream { array.data() };
auto result = Wasm::Module::parse(stream);
if (result.is_error())
return vm.throw_completion<JS::SyntaxError>(Wasm::parse_error_to_deprecated_string(result.error()));