RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:38:11 +00:00
Code Issues Activity Actions

AK: Fix 64-bit alignment issue in shared-superstring substrings

Browse source 
Thanks to Timothy Flynn for the test!

Fixes #17141
This commit is contained in:
Andreas Kling 2023-02-18 13:43:52 +01:00 • committed by Tim Flynn
parent ba5df46a49
commit d0697d350d
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AK/String.cpp
View file

@ -77,7 +77,7 @@ private:
bool m_substring { false }; bool m_substring { false };
bool m_is_fly_string { false }; bool m_is_fly_string { false };
u8 m_bytes_or_substring_data[0]; alignas(SubstringData) u8 m_bytes_or_substring_data[0];
}; };
void StringData::operator delete(void* ptr) void StringData::operator delete(void* ptr)

11
Tests/AK/TestString.cpp
View file

@ -97,6 +97,17 @@ TEST_CASE(substring)
EXPECT_EQ(long_substring, "Hello I am"sv); EXPECT_EQ(long_substring, "Hello I am"sv);
} }
TEST_CASE(substring_with_shared_superstring)
{
auto superstring = MUST(String::from_utf8("Hello I am a long string"sv));
auto substring1 = MUST(superstring.substring_from_byte_offset_with_shared_superstring(0, 5));
EXPECT_EQ(substring1, "Hello"sv);
auto substring2 = MUST(superstring.substring_from_byte_offset_with_shared_superstring(0, 10));
EXPECT_EQ(substring2, "Hello I am"sv);
}
TEST_CASE(code_points) TEST_CASE(code_points)
{ {
auto string = MUST(String::from_utf8("🦬🪒"sv)); auto string = MUST(String::from_utf8("🦬🪒"sv));