Changeset 258828 in webkit

Timestamp:

Mar 23, 2020 2:48:12 AM (4 years ago)

Author:

youenn@apple.com

Message:

StringView::startsWith and String::startsWith do not treat null strings the same
​https://bugs.webkit.org/show_bug.cgi?id=209273

Reviewed by Darin Adler.

Source/WTF:

Align StringImpl with StringView and make startsWith return true if prefix is null.

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::startsWith const):

Tools:

• TestWebKitAPI/Tests/WTF/StringView.cpp:

(TestWebKitAPI::TEST):

• TestWebKitAPI/Tests/WTF/WTFString.cpp:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/text/StringImpl.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/StringView.cpp (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-03-23  youenn fablet  <youenn@apple.com>
+
+        StringView::startsWith and String::startsWith do not treat null strings the same
+        https://bugs.webkit.org/show_bug.cgi?id=209273
+
+        Reviewed by Darin Adler.
+
+        Align StringImpl with StringView and make startsWith return true if prefix is null.
+
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::startsWith const):
+
 2020-03-22  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WTF/wtf/text/StringImpl.cpp

@@ -1184 +1184 @@
 bool StringImpl::startsWith(const StringImpl* string) const
 {
-    return string && ::WTF::startsWith(*this, *string);
+    return !string || ::WTF::startsWith(*this, *string);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-23  youenn fablet  <youenn@apple.com>
+
+        StringView::startsWith and String::startsWith do not treat null strings the same
+        https://bugs.webkit.org/show_bug.cgi?id=209273
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/StringView.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WTF/WTFString.cpp:
+        (TestWebKitAPI::TEST):
+
 2020-03-22  Antoine Quint  <graouts@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp

@@ -42 +42 @@
 }
 
+TEST(WTF, StringViewStartsWithEmptyVsNull)
+{
+    StringView nullView;
+    StringView emptyView = StringView::empty();
+    String stringWithCharacters("hello");
+    StringView viewWithCharacters(stringWithCharacters);
+
+    EXPECT_TRUE(viewWithCharacters.startsWith(nullView));
+    EXPECT_TRUE(viewWithCharacters.startsWith(emptyView));
+}
+
 TEST(WTF, StringViewEmptyVsNull)
 {

trunk/Tools/TestWebKitAPI/Tests/WTF/WTFString.cpp

@@ -72 +72 @@
 }
 
+TEST(WTF, StringStartsWithEmptyVsNull)
+{
+    String nullString;
+    String emptyString = WTF::emptyString();
+    String stringWithCharacters("hello");
+
+    EXPECT_TRUE(stringWithCharacters.startsWith(nullString));
+    EXPECT_TRUE(stringWithCharacters.startsWith(emptyString));
+}
+
 static inline const char* testStringNumberFixedPrecision(double number)
 {