Changeset 27153 in webkit for trunk/JavaScriptCore/kjs/ustring.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/ustring.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -422 +422 @@
     return;
   }
-  size_t length = strlen(c);
-  if (length == 0) {
+
+  if (!c[0]) {
     m_rep = &Rep::empty;
     return;
   }
+
+  size_t length = strlen(c);
   UChar *d = allocChars(length);
   if (!d)
@@ -898 +900 @@
     }
 
-    int l = static_cast<int>(strlen(c));
-    if (!l) {
+    if (!c[0]) {
         m_rep = &Rep::empty;
         return *this;
     }
 
+  int l = static_cast<int>(strlen(c));
   UChar *d;
   if (m_rep->rc == 1 && l <= m_rep->capacity && m_rep->baseIsSelf() && m_rep->offset == 0 && m_rep->preCapacity == 0) {