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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:45:38 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit acff43f42e74b6884bbe91fbc95c4c9d1524edfe
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 14 22:43:04 2004 +0000

            Reviewed by Vicki
    
            Fix for this bug:
    
            <rdar://problem/3690115> Crash deleting text out of iChat's profile (an editable Webview)
    
            * khtml/html/html_elementimpl.cpp:
            (HTMLElementImpl::isFocusable): Added null-check of parent node before deref'ing it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0cd35a..9766e36 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-06-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Vicki
+
+        Fix for this bug:
+        
+        <rdar://problem/3690115> Crash deleting text out of iChat's profile (an editable Webview)
+
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLElementImpl::isFocusable): Added null-check of parent node before deref'ing it.
+
 2004-06-14  Trey Matteson  <trey at apple.com>
 
 	Two tweaks to recently added "drag" pseudo-class, as suggested by
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 496a266..5d2b794 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -970,7 +970,7 @@ void HTMLElementImpl::addHTMLAlignment(HTMLAttributeImpl* attr)
 
 bool HTMLElementImpl::isFocusable() const
 {
-    return isContentEditable() && !parent()->isContentEditable();
+    return isContentEditable() && parent() && !parent()->isContentEditable();
 }
 
 bool HTMLElementImpl::isContentEditable() const 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list