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

sullivan sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:36:22 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 12ea3bb06f2d44ed0dd1debdeb8c8d23efa20e06
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 10:40:20 2004 +0000

            - fixed <rdar://problem/3631541>: "repro crash in KHTMLPart::setFocusNodeIfNeeded"
    
            Reviewed by Maciej.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::setFocusNodeIfNeeded):
            added nil check
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0c88e87..255ec0d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-23  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3631541>: "repro crash in KHTMLPart::setFocusNodeIfNeeded"
+
+        Reviewed by Maciej.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::setFocusNodeIfNeeded):
+        added nil check
+
 2004-04-23  Maciej Stachowiak  <mjs at apple.com>
 
         Back out one of the previous changes, it causes a crash. Whoops!
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index ea837ab..c6bae04 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2545,7 +2545,7 @@ void KHTMLPart::setFocusNodeIfNeeded(const Selection &s)
     NodeImpl *n = s.start().node();
     NodeImpl *target = n->isContentEditable() ? n : 0;
     if (!target) {
-        while (n != s.end().node()) {
+        while (n && n != s.end().node()) {
             if (n->isContentEditable()) {
                 target = n;
                 break;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list