[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 0592bef9f6772440f86ade90d017a2ea5bd849f5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 27 09:25:16 2004 +0000

            Reviewed by Dave.
    
    	- fixed <rdar://problem/3571356>: REGRESSION: Crash in isPointInsideSelection clicking on link in Apple web directory frame
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::isPointInsideSelection): Don't crash if innerNode is
    	NULL, as this can happen mousing over a frame that's in the
    	process of loading and currently empty. Since such a frame
    	obviously can't be inside the selection, this seems like a good
    	enough fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8e7a3d..a54bfd5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2004-02-27  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed <rdar://problem/3571356>: REGRESSION: Crash in isPointInsideSelection clicking on link in Apple web directory frame
+	
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::isPointInsideSelection): Don't crash if innerNode is
+	NULL, as this can happen mousing over a frame that's in the
+	process of loading and currently empty. Since such a frame
+	obviously can't be inside the selection, this seems like a good
+	enough fix.
+	
 2004-02-26  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3528839, wide table cut off because of shorts being used instead of ints.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 8f0568c..9682822 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4426,7 +4426,7 @@ bool KHTMLPart::isPointInsideSelection(int x, int y)
     RenderObject::NodeInfo nodeInfo(true, true);
     xmlDocImpl()->renderer()->layer()->nodeAtPoint(nodeInfo, x, y);
     DOM::NodeImpl* innerNode = nodeInfo.innerNode();
-    if (!innerNode->renderer()) {
+    if (!innerNode || !innerNode->renderer()) {
         return false;
     }
     

-- 
WebKit Debian packaging