Changeset 35623 in webkit

Timestamp:

Aug 7, 2008 5:09:19 AM (16 years ago)

Author:

jmalonzo@webkit.org

Message:

2008-08-07 Alp Toker <​alp@nuanti.com>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=20313
Add null check in String::fromUTF8()

Make String::fromUTF8() consistent with other constructors by
returning a null String when the input is null instead of crashing.

• platform/text/String.cpp: (WebCore::String::fromUTF8):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/String.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-07  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=20313
+        Add null check in String::fromUTF8()
+
+        Make String::fromUTF8() consistent with other constructors by
+        returning a null String when the input is null instead of crashing.
+
+        * platform/text/String.cpp:
+        (WebCore::String::fromUTF8):
+
 2008-08-06  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/platform/text/String.cpp

@@ -583 +583 @@
 String String::fromUTF8(const char* string, size_t size)
 {
+    if (!string)
+        return String();
     return UTF8Encoding().decode(string, size);
 }
@@ -588 +590 @@
 String String::fromUTF8(const char* string)
 {
+    if (!string)
+        return String();
     return UTF8Encoding().decode(string, strlen(string));
 }