Changeset 47092 in webkit for trunk/JavaScriptCore/runtime/UString.h

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/UString.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/UString.h

@@ -92 +92 @@
                 // Guard against integer overflow
                 if (size < (std::numeric_limits<size_t>::max() / sizeof(UChar))) {
-                    if (void * buf = tryFastMalloc(size * sizeof(UChar)))
+                    void * buf = 0;
+                    if (tryFastMalloc(size * sizeof(UChar)).getValue(buf))
                         return adoptRef(new BaseString(static_cast<UChar*>(buf), 0, size));
                 }