[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit bcc741137cc291394e14ac7d41c412b3a24e1fe5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 20:14:08 2009 +0000

    2009-12-09  Søren Gjesse  <sgjesse at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 92ef5b6..c6b56e9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-09  Søren Gjesse  <sgjesse at 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 at email.unc.edu>
 
         Fix the build with ENABLE_ORIENTATION_EVENTS
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index b05aa58..1c57774 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -389,11 +389,12 @@ bool V8Proxy::setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetCont
     if (m_context.IsEmpty())
         return false;
     int debugId = contextDebugId(m_context);
-    if (debugId == -1)
-        return false;
 
     char buffer[32];
-    snprintf(buffer, sizeof(buffer), "injected,%d", debugId);
+    if (debugId == -1)
+        snprintf(buffer, sizeof(buffer), "injected");
+    else
+        snprintf(buffer, sizeof(buffer), "injected,%d", debugId);
     targetContext->SetData(v8::String::New(buffer));
 
     return true;
@@ -1378,6 +1379,8 @@ int V8Proxy::contextDebugId(v8::Handle<v8::Context> context)
         return -1;
     v8::String::AsciiValue ascii(context->GetData());
     char* comma = strnstr(*ascii, ",", ascii.length());
+    if (!comma)
+        return -1;
     return atoi(comma + 1);
 }
 

-- 
WebKit Debian packaging