Changeset 51912 in webkit

Timestamp:

Dec 9, 2009 12:14:08 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-09 Søren Gjesse <​sgjesse@chromium.org>

Reviewed by Pavel Feldman.

[V8] Isolated world reuse failure
​https://bugs.webkit.org/show_bug.cgi?id=32306

Fixed bug introduced in r51407: (​http://trac.webkit.org/changeset/51407) which caused layout test
LayoutTests/http/tests/security/isolatedWorld/world-reuse.html to fail.

• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::setInjectedScriptContextDebugId): (WebCore::V8Proxy::contextDebugId):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-09  Søren Gjesse  <sgjesse@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [V8] Isolated world reuse failure
+        https://bugs.webkit.org/show_bug.cgi?id=32306
+
+        Fixed bug introduced in r51407: (http://trac.webkit.org/changeset/51407) which caused layout test
+        LayoutTests/http/tests/security/isolatedWorld/world-reuse.html to fail.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::setInjectedScriptContextDebugId):
+        (WebCore::V8Proxy::contextDebugId):
+
 2009-12-09  Patrick Scott  <phanna@email.unc.edu>
 

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -390 +390 @@
         return false;
     int debugId = contextDebugId(m_context);
+
+    char buffer[32];
     if (debugId == -1)
-        return false;
-
-    char buffer[32];
-    snprintf(buffer, sizeof(buffer), "injected,%d", debugId);
+        snprintf(buffer, sizeof(buffer), "injected");
+    else
+        snprintf(buffer, sizeof(buffer), "injected,%d", debugId);
     targetContext->SetData(v8::String::New(buffer));
 
@@ -1379 +1380 @@
     v8::String::AsciiValue ascii(context->GetData());
     char* comma = strnstr(*ascii, ",", ascii.length());
+    if (!comma)
+        return -1;
     return atoi(comma + 1);
 }