Changeset 47227 in webkit

Timestamp:

Aug 13, 2009 1:18:04 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-13 Christian Plesner Hansen <​christian.plesner.hansen@gmail.com>

Reviewed by Dimitri Glazkov.

[v8] Fix atomic string externalization crash.
Atomic string externalization assumes that all non-empty strings
can be externalized which is untrue on 64-bit. This change fixed
that.

​https://bugs.webkit.org/show_bug.cgi?id=28215

This bug causes loads of test crashes, no need to add new tests
specifically for this.

• bindings/v8/V8Binding.cpp: (WebCore::v8StringToAtomicWebCoreString):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Binding.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-13  Christian Plesner Hansen  <christian.plesner.hansen@gmail.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        [v8] Fix atomic string externalization crash.
+        Atomic string externalization assumes that all non-empty strings
+        can be externalized which is untrue on 64-bit.  This change fixed
+        that.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28215
+
+        This bug causes loads of test crashes, no need to add new tests
+        specifically for this.
+
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::v8StringToAtomicWebCoreString):
+
 2009-08-13  George Staikos  <george.staikos@torchmobile.com>
 

trunk/WebCore/bindings/v8/V8Binding.cpp

@@ -155 +155 @@
     WebCoreStringResource* stringResource = WebCoreStringResource::toStringResource(v8String);
     if (!stringResource) {
+        if (!v8String->CanMakeExternal())
+            return v8StringToWebCoreString(v8String, DoNotExternalize, AtomicStringType);
         // If this string hasn't been externalized, we force it now.
-        String plain = v8StringToWebCoreString(v8String, Externalize, AtomicStringType);
-        // If the string is empty there's no room to cache an atomic
-        // string so we bail out.
-        if (plain.isEmpty())
-            return plain;
+        v8StringToWebCoreString(v8String, Externalize, AtomicStringType);
         stringResource = WebCoreStringResource::toStringResource(v8String);
-        ASSERT(stringResource != NULL);
+        ASSERT(stringResource);
     }
     return stringResource->atomicString();