Changeset 5264 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 26, 2003, 8:21:15 PM (22 years ago)

Author:

darin

Message:

• rolled in some CString changes Harri Porten did on the KDE side

• kjs/ustring.cpp: (KJS::CString::CString): Use memcpy instead of strcpy for speed. Fix an off by one error in the copy constructor. (KJS::CString::operator=): Use memcpy instead of strcpy for speed.

• JavaScriptCorePrefix.h: Add a definition of NULL here that matches the one in Merlot. This makes us see warnings that otherwise would be Merlot-only warnings.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -51 +51 @@
   length = strlen(c);
   data = new char[length+1];
-  strcpy(data, c);
+  memcpy(data, c, length + 1);
 }
 
@@ -66 +66 @@
   length = b.length;
   data = new char[length+1];
-  memcpy(data, b.data, length);
+  memcpy(data, b.data, length + 1);
 }
 
@@ -97 +97 @@
   length = strlen(c);
   data = new char[length+1];
-  strcpy(data, c);
+  memcpy(data, c, length + 1);
 
   return *this;