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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:17:26 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 6affba774fef5843f31e514d5372d6eb32dbfdef
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 10 00:53:40 2003 +0000

            Reviewed by John.
    
            - fixed 3505277: nil-deref in ownerElement after choosing item from menu at projectnissan.com
    
            * khtml/xml/dom_nodeimpl.cpp: (NodeImpl::dispatchWindowEvent): Add check for nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5737 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90b8c6c..0c5c521 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-12-09  Darin Adler  <darin at apple.com>
 
+        Reviewed by John.
+
+        - fixed 3505277: nil-deref in ownerElement after choosing item from menu at projectnissan.com
+
+        * khtml/xml/dom_nodeimpl.cpp: (NodeImpl::dispatchWindowEvent): Add check for nil.
+
+2003-12-09  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         * kwq/KWQKHTMLPart.mm:
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index a5c082f..6c467f5 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -617,7 +617,7 @@ bool NodeImpl::dispatchWindowEvent(int _id, bool canBubbleArg, bool cancelableAr
     if (!evt->defaultPrevented() && doc->document())
 	doc->document()->defaultEventHandler(evt);
     
-    if (_id == EventImpl::LOAD_EVENT && !evt->propagationStopped()) {
+    if (_id == EventImpl::LOAD_EVENT && !evt->propagationStopped() && doc->document()) {
         // For onload events, send them to the enclosing frame only.
         // This is a DOM extension and is independent of bubbling/capturing rules of
         // the DOM.  You send the event only to the enclosing frame.  It does not

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list