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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 593414a48868f54173a5971b35caa526e0cf5579
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 19:31:47 2010 +0000

    2010-09-16  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: quick fix for crash in InspectorController::loadBreakpoints caused by empty main resource
            https://bugs.webkit.org/show_bug.cgi?id=45901
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::breakpointsSettingKey):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5104694..36b1b3f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-16  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: quick fix for crash in InspectorController::loadBreakpoints caused by empty main resource
+        https://bugs.webkit.org/show_bug.cgi?id=45901
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::breakpointsSettingKey):
+
 2010-09-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 7cba325..a9ef261 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1653,6 +1653,8 @@ void InspectorController::didEvaluateForTestInFrontend(long callId, const String
 String InspectorController::breakpointsSettingKey()
 {
     DEFINE_STATIC_LOCAL(String, keyPrefix, ("breakpoints:"));
+    if (!m_mainResource)
+        return "";
     return keyPrefix + InspectorDebuggerAgent::md5Base16(m_mainResource->requestURL());
 }
 

-- 
WebKit Debian packaging