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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f0cad26eae8b0ad03d1e329471fabbfd6c3e42bf
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 21 01:33:13 2002 +0000

            Fixed crasher in findTextSlave.
            * khtml/rendering/render_text.cpp:
            (RenderText::findTextSlave):
    
            Added error checks.
            * khtml/khtml_part.cpp:
            (startAndEndLineNodesIncludingNode):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 35f8598..c1b3065 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Fixed crasher in findTextSlave.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::findTextSlave):
+
+        Added error checks.
+        * khtml/khtml_part.cpp:
+        (startAndEndLineNodesIncludingNode):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Made double and triple click selection behave like
         like other selection in OS X.  That is, selection happens
         on mouse down, not mouse up, and can be extended by
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 35f8598..c1b3065 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Fixed crasher in findTextSlave.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::findTextSlave):
+
+        Added error checks.
+        * khtml/khtml_part.cpp:
+        (startAndEndLineNodesIncludingNode):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Made double and triple click selection behave like
         like other selection in OS X.  That is, selection happens
         on mouse down, not mouse up, and can be extended by
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 35f8598..c1b3065 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Fixed crasher in findTextSlave.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::findTextSlave):
+
+        Added error checks.
+        * khtml/khtml_part.cpp:
+        (startAndEndLineNodesIncludingNode):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Made double and triple click selection behave like
         like other selection in OS X.  That is, selection happens
         on mouse down, not mouse up, and can be extended by
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index b22bc1a..6741386 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4009,11 +4009,13 @@ static bool startAndEndLineNodesIncludingNode (DOM::NodeImpl *node, int offset,
         
         // Look for all the first child in the block that is on the same line
         // as the selection point.
-        firstSlaveAt (renderNode, selectionPointY, startNode, startOffset);
+        if (!firstSlaveAt (renderNode, selectionPointY, startNode, startOffset))
+            return false;
     
         // Look for all the last child in the block that is on the same line
         // as the selection point.
-        lastSlaveAt (renderNode, selectionPointY, endNode, endOffset);
+        if (!lastSlaveAt (renderNode, selectionPointY, endNode, endOffset))
+            return false;
         
         _startNode = startNode;
         _endNode = endNode;
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index b4d293d..4181de4 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -343,11 +343,11 @@ TextSlave * RenderText::findTextSlave( int offset, int &pos )
         return 0L;
 
     TextSlave* s = m_lines[0];
-    uint si = 0;
+    uint si = 1;
     int off = s->m_len;
     while(offset > off && si < m_lines.count())
     {
-        s = m_lines[++si];
+        s = m_lines[si++];
         off = s->m_start + s->m_len;
     }
     // we are now in the correct text slave

-- 
WebKit Debian packaging