Changeset 47092 in webkit for trunk/JavaScriptCore/runtime/JSArray.cpp

Timestamp:

Aug 11, 2009, 11:22:41 PM (16 years ago)

Author:

[email protected]

Message:

Make it harder to misuse try* allocation routines
​https://bugs.webkit.org/show_bug.cgi?id=27469

Reviewed by Gavin Barraclough

Jump through a few hoops to make it much harder to accidentally
miss null-checking of values returned by the try-* allocation
routines.

File:

• trunk/JavaScriptCore/runtime/JSArray.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSArray.cpp

@@ -349 +349 @@
     }
 
-    storage = static_cast<ArrayStorage*>(tryFastRealloc(storage, storageSize(newVectorLength)));
-    if (!storage) {
+    if (!tryFastRealloc(storage, storageSize(newVectorLength)).getValue(storage)) {
         throwOutOfMemoryError(exec);
         return;
@@ -468 +467 @@
     unsigned newVectorLength = increasedVectorLength(newLength);
 
-    storage = static_cast<ArrayStorage*>(tryFastRealloc(storage, storageSize(newVectorLength)));
-    if (!storage)
+    if (!tryFastRealloc(storage, storageSize(newVectorLength)).getValue(storage))
         return false;