[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:55 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit fa09cbfb65057b70d30a2d578383f9921ee786ee
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 11 05:15:54 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3506739: nil-deref in DocumentImpl::setSelection triple clicking (generated content)
    
            * khtml/khtml_part.cpp: (KHTMLPart::khtmlMousePressEvent): Check for the case where
            m_selectionEnd is 0. This doesn't fix the behavior completely, but it does prevent a crash.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8aba3cd..2419079 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-12-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3506739: nil-deref in DocumentImpl::setSelection triple clicking (generated content)
+
+        * khtml/khtml_part.cpp: (KHTMLPart::khtmlMousePressEvent): Check for the case where
+        m_selectionEnd is 0. This doesn't fix the behavior completely, but it does prevent a crash.
+
 2003-12-10  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 6b9c57b..7f36cff 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4613,7 +4613,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
                 }
             }
         }
-        if (d->m_selectionStart == 0)
+        if (d->m_selectionStart == 0 || d->m_selectionEnd == 0)
             d->m_doc->clearSelection();
         else{
             d->m_initialSelectionStart = d->m_selectionStart;
@@ -4652,7 +4652,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
                 startAndEndLineNodesIncludingNode (node, startOffset, d->m_selectionStart, d->m_startOffset, d->m_selectionEnd, d->m_endOffset);
             }
         }
-        if (d->m_selectionStart == 0)
+        if (d->m_selectionStart == 0 || d->m_selectionEnd == 0)
             d->m_doc->clearSelection();
         else {
             d->m_initialSelectionStart = d->m_selectionStart;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list