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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 829696877665192ee3e898aef444ca7a58c098c7
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 14:29:57 2010 +0000

    2010-11-05  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Crash in InspectorDOMAgent::innerParentNode.
            https://bugs.webkit.org/show_bug.cgi?id=49054
    
            * inspector/InspectorDOMAgent.cpp:
            (WebCore::InspectorDOMAgent::setOuterHTML):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d025ec..26928c2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Timothy Hatcher.
 
+        Web Inspector: Crash in InspectorDOMAgent::innerParentNode.
+        https://bugs.webkit.org/show_bug.cgi?id=49054
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::setOuterHTML):
+
+2010-11-05  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
         Web Inspector: XHR logging in console should give complete view of resource.
         https://bugs.webkit.org/show_bug.cgi?id=48998
 
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index cfb55fc..9316296 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -568,6 +568,12 @@ void InspectorDOMAgent::setOuterHTML(long nodeId, const String& outerHTML, long*
     }
 
     Node* newNode = previousSibling ? previousSibling->nextSibling() : parentNode->firstChild();
+    if (!newNode) {
+        // The only child node has been deleted.
+        *newId = 0;
+        return;
+    }
+
     *newId = pushNodePathToFrontend(newNode);
     if (childrenRequested)
         pushChildNodesToFrontend(*newId);

-- 
WebKit Debian packaging