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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e2dcfd9407e84d73685f66f521f903b0898d0157
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 5 01:22:49 2003 +0000

    	- fixed 3399880 -- Repro crash when filling out a form to
    	download Macromedia software. I managed to check in this
    	ChangeLog comment a few days ago without actually checking
    	in the changed file, weird.
    
            Reviewed by Chris
    
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge elementForView:]):
    	check for nil widget before dereferencing
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f4c649b..42cfbee 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-09-04  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3399880 -- Repro crash when filling out a form to
+	download Macromedia software. I managed to check in this
+	ChangeLog comment a few days ago without actually checking
+	in the changed file, weird.
+
+        Reviewed by Chris
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementForView:]):
+	check for nil widget before dereferencing
+
 2003-09-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3408630, leak of child frame parts caused by a missing deref when frames
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f4c649b..42cfbee 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-09-04  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3399880 -- Repro crash when filling out a form to
+	download Macromedia software. I managed to check in this
+	ChangeLog comment a few days ago without actually checking
+	in the changed file, weird.
+
+        Reviewed by Chris
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementForView:]):
+	check for nil widget before dereferencing
+
 2003-09-04  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3408630, leak of child frame parts caused by a missing deref when frames
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index cbb9c0b..9e6c40f 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -541,15 +541,16 @@ static BOOL nowPrinting(WebCoreBridge *self)
 
 - (id <WebDOMElement>)elementForView:(NSView *)view
 {
-    // FIXME: implemetented currently for only a subset of the KWQ widgets
+    // FIXME: implemented currently for only a subset of the KWQ widgets
     if ([view conformsToProtocol:@protocol(KWQWidgetHolder)]) {
         NSView <KWQWidgetHolder> *widgetHolder = view;
         QWidget *widget = [widgetHolder widget];
-        NodeImpl *node = static_cast<const RenderWidget *>(widget->eventFilterObject())->element();
-        return [WebCoreDOMElement elementWithImpl:static_cast<ElementImpl *>(node)];
-    } else {
-        return nil;
+        if (widget != nil) {
+            NodeImpl *node = static_cast<const RenderWidget *>(widget->eventFilterObject())->element();
+            return [WebCoreDOMElement elementWithImpl:static_cast<ElementImpl *>(node)];
+        }
     }
+    return nil;
 }
 
 static NSView *viewForElement(DOM::ElementImpl *elementImpl)

-- 
WebKit Debian packaging