Changeset 27153 in webkit for trunk/JavaScriptCore/kjs/identifier.cpp

Timestamp:

Oct 27, 2007, 12:20:25 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Darin Adler.

Fixed the rest of "ASSERTION FAILED: _hash in KJS::UString::Rep::
computedHash()"
​http://bugs.webkit.org/show_bug.cgi?id=15718

• kjs/identifier.cpp: Fixed more cases where an Identifier didn't get a hash value. Also changed O(n) strlen to O(1) check for empty string. (KJS::Identifier::add):

• kjs/ustring.cpp: Changed O(n) strlens to O(1) checks for empty string. (KJS::UString::UString): (KJS::UString::operator=):

File:

• trunk/JavaScriptCore/kjs/identifier.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -126 +126 @@
 PassRefPtr<UString::Rep> Identifier::add(const char *c)
 {
-    if (!c)
+    if (!c) {
+        UString::Rep::null.hash();
         return &UString::Rep::null;
-    size_t length = strlen(c);
-    if (length == 0)
+    }
+
+    if (!c[0]) {
+        UString::Rep::empty.hash();
         return &UString::Rep::empty;
+    }
     
     return *identifierTable().add<const char *, CStringTranslator>(c).first;
@@ -169 +173 @@
 PassRefPtr<UString::Rep> Identifier::add(const UChar *s, int length)
 {
-    if (length == 0)
+    if (!length) {
+        UString::Rep::empty.hash();
         return &UString::Rep::empty;
+    }
     
     UCharBuffer buf = {s, length};