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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit ca74e0262e95754b5e8c2de7bf87aba59293533e
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 26 20:49:44 2003 +0000

    	- fixed 3262849 -- jump to nil in KWQKHTMLPart::searchForLabelsAboveCell
    	at techbargains.com
    
            Reviewed by Dave
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::searchForLabelsAboveCell):
    	check for nil result of cellAboveRenderer->element()
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4424 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8d95a8a..9192034 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-05-26  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3262849 -- jump to nil in KWQKHTMLPart::searchForLabelsAboveCell 
+	at techbargains.com
+
+        Reviewed by Dave
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::searchForLabelsAboveCell):
+	check for nil result of cellAboveRenderer->element()
+
 2003-05-23  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3229799, images missing on geocities page.  Residual style
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8d95a8a..9192034 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-05-26  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3262849 -- jump to nil in KWQKHTMLPart::searchForLabelsAboveCell 
+	at techbargains.com
+
+        Reviewed by Dave
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::searchForLabelsAboveCell):
+	check for nil result of cellAboveRenderer->element()
+
 2003-05-23  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3229799, images missing on geocities page.  Residual style
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index ba03b6a..3935127 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -317,16 +317,18 @@ NSString *KWQKHTMLPart::searchForLabelsAboveCell(QRegExp *regExp, HTMLTableCellE
         HTMLTableCellElementImpl *aboveCell =
             static_cast<HTMLTableCellElementImpl *>(cellAboveRenderer->element());
 
-        // search within the above cell we found for a match
-        for (NodeImpl *n = aboveCell->firstChild(); n; n = n->traverseNextNode(aboveCell)) {
-            if (idFromNode(n) == ID_TEXT
-                && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
-            {
-                // For each text chunk, run the regexp
-                QString nodeString = n->nodeValue().string();
-                int pos = regExp->searchRev(nodeString);
-                if (pos >= 0) {
-                    return nodeString.mid(pos, regExp->matchedLength()).getNSString();
+        if (aboveCell) {
+            // search within the above cell we found for a match
+            for (NodeImpl *n = aboveCell->firstChild(); n; n = n->traverseNextNode(aboveCell)) {
+                if (idFromNode(n) == ID_TEXT
+                    && n->renderer() && n->renderer()->style()->visibility() == VISIBLE)
+                {
+                    // For each text chunk, run the regexp
+                    QString nodeString = n->nodeValue().string();
+                    int pos = regExp->searchRev(nodeString);
+                    if (pos >= 0) {
+                        return nodeString.mid(pos, regExp->matchedLength()).getNSString();
+                    }
                 }
             }
         }

-- 
WebKit Debian packaging