beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 15:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AK: Ensure empty StringViews all compare as equal

Browse source 
Before this change, a StringView with a character-data pointer would
never compare as equal to one with a null pointer, even if they were
both length 0. This could happen for example if one is
default-initialized, and the other is created as a substring.
This commit is contained in:
Sam Atkins 2024-11-15 13:08:15 +00:00 committed by Andreas Kling
parent 87fc7028d7
commit ec5101a1d3
Notes: github-actions[bot] 2024-11-15 22:27:14 +00:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/LadybirdBrowser/ladybird/commit/ec5101a1d3c
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2368
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AK/StringView.h
View file

@ -283,6 +283,9 @@ public:
[[nodiscard]] constexpr int compare(StringView other) const [[nodiscard]] constexpr int compare(StringView other) const
{ {
if (m_length == 0 && other.m_length == 0)
return 0;
if (m_characters == nullptr) if (m_characters == nullptr)
return other.m_characters ? -1 : 0; return other.m_characters ? -1 : 0;

7
Tests/AK/TestStringView.cpp
View file

@ -38,6 +38,13 @@ TEST_CASE(compare_views)
EXPECT_EQ(view1, foo1); EXPECT_EQ(view1, foo1);
EXPECT_EQ(view1, foo2); EXPECT_EQ(view1, foo2);
EXPECT_EQ(view1, "foo"); EXPECT_EQ(view1, "foo");
ByteString empty = "";
auto empty_view = view1.substring_view(0, 0);
StringView default_view = {};
EXPECT_EQ(empty.view(), ""sv);
EXPECT_EQ(empty_view, ""sv);
EXPECT_EQ(default_view, ""sv);
} }
TEST_CASE(conforms_to_iterator_protocol) TEST_CASE(conforms_to_iterator_protocol)