Changeset 54518 in webkit for trunk/JavaScriptCore/runtime/JSStringBuilder.h

Timestamp:

Feb 8, 2010, 3:43:26 PM (15 years ago)

Author:

[email protected]

Message:

Make makeString CRASH if we fail to allocate a string.

Reviewed by Geoff Garen.

(tryMakeString or jsMakeNontrivialString can be used where we
expect allocation may fail and want to handle the error).

• runtime/JSStringBuilder.h:

(JSC::jsMakeNontrivialString):

• runtime/UString.h:

(JSC::tryMakeString):
(JSC::makeString):

File:

• trunk/JavaScriptCore/runtime/JSStringBuilder.h (modified) (5 diffs)

trunk/JavaScriptCore/runtime/JSStringBuilder.h

@@ -47 +47 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2)
 {
-    UString result = makeString(string1, string2);
-    if (result.isNull())
+    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2);
+    if (!result)
         return throwOutOfMemoryError(exec);
     return jsNontrivialString(exec, result);
@@ -56 +56 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3)
 {
-    UString result = makeString(string1, string2, string3);
-    if (result.isNull())
+    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3);
+    if (!result)
         return throwOutOfMemoryError(exec);
     return jsNontrivialString(exec, result);
@@ -65 +65 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4)
 {
-    UString result = makeString(string1, string2, string3, string4);
-    if (result.isNull())
+    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4);
+    if (!result)
         return throwOutOfMemoryError(exec);
     return jsNontrivialString(exec, result);
@@ -74 +74 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5)
 {
-    UString result = makeString(string1, string2, string3, string4, string5);
-    if (result.isNull())
+    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4, string5);
+    if (!result)
         return throwOutOfMemoryError(exec);
     return jsNontrivialString(exec, result);
@@ -83 +83 @@
 inline JSValue jsMakeNontrivialString(ExecState* exec, StringType1 string1, StringType2 string2, StringType3 string3, StringType4 string4, StringType5 string5, StringType6 string6)
 {
-    UString result = makeString(string1, string2, string3, string4, string5, string6);
-    if (result.isNull())
+    PassRefPtr<UStringImpl> result = tryMakeString(string1, string2, string3, string4, string5, string6);
+    if (!result)
         return throwOutOfMemoryError(exec);
     return jsNontrivialString(exec, result);