From d227fc870c7a697500a3c900c31baf05fb9a8524 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 18 Aug 2009 15:36:45 +0100
Subject: Merge WebKit r47420

---
 JavaScriptCore/runtime/UString.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'JavaScriptCore/runtime/UString.h')

diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index d01b75d..2dbca1f 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -91,7 +91,8 @@ namespace JSC {
             {
                 // 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));
                 }
                 return adoptRef(new BaseString(0, 0, 0));
@@ -256,6 +257,7 @@ namespace JSC {
         }
 
         static UString from(int);
+        static UString from(long long);
         static UString from(unsigned int);
         static UString from(long);
         static UString from(double);
-- 
cgit v1.1