[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ec93d0ab2feb5fc0cdc9ab507a94de2e42237f00
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 15:38:30 2010 +0000

    2010-07-16  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            [V8] V8Proxy::retrieve may return null if javascript is disabled. Add a check
            to avoid crashes in inspected page.
            https://bugs.webkit.org/show_bug.cgi?id=42065
    
            * bindings/v8/ScriptDebugServer.cpp:
            (WebCore::ScriptDebugServer::addListener):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d59038c..77d216e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-16  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        [V8] V8Proxy::retrieve may return null if javascript is disabled. Add a check
+        to avoid crashes in inspected page.
+        https://bugs.webkit.org/show_bug.cgi?id=42065
+
+        * bindings/v8/ScriptDebugServer.cpp:
+        (WebCore::ScriptDebugServer::addListener):
+
 2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/bindings/v8/ScriptDebugServer.cpp b/WebCore/bindings/v8/ScriptDebugServer.cpp
index d995cc1..0a432b7 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.cpp
+++ b/WebCore/bindings/v8/ScriptDebugServer.cpp
@@ -83,6 +83,11 @@ void ScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
 {
     if (!m_enabled)
         return;
+
+    V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());
+    if (!proxy)
+        return;
+
     v8::HandleScope scope;
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     v8::Context::Scope contextScope(debuggerContext);
@@ -93,7 +98,7 @@ void ScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
         v8::Debug::SetDebugEventListener2(&ScriptDebugServer::v8DebugEventCallback);
     }
     m_listenersMap.set(page, listener);
-    V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());
+
     v8::Local<v8::Context> context = proxy->mainWorldContext();
 
     v8::Handle<v8::Function> getScriptsFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("getScripts")));

-- 
WebKit Debian packaging