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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 8d88806f8b134a60ea4d85f2b8d7e42a670415eb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 23:23:55 2003 +0000

    	Fix for 3480108, crash because of the wrong malformedTableParent when stray content is placed inside
    	a <tr>.
    
            Reviewed by john
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::popBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e11fdb6..7a92b6f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-17  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3480108, crash because of the wrong malformedTableParent when stray content is placed inside
+	a <tr>.
+	
+        Reviewed by john
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::popBlock):
+
 2003-11-17  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 21e2123..5a0a4f5 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1473,12 +1473,15 @@ void KHTMLParser::popBlock( int _id )
             Elem = 0;
 
             // This element was the root of some malformed content just inside an implicit or
-            // explicit <tbody>.
+            // explicit <tbody> or <tr>.
             // If we end up needing to reopen residual style tags, the root of the reopened chain
-            // must also know that it is the root of malformed content inside a <tbody>.
-            if (strayTable && !inStrayTableContent && residualStyleStack)
-                malformedTableParent = current && current->parentNode() ? 
-		  current->parentNode()->parentNode() : 0;
+            // must also know that it is the root of malformed content inside a <tbody>/<tr>.
+            if (strayTable && !inStrayTableContent && residualStyleStack) {
+                NodeImpl* curr = current;
+                while (curr && curr->id() != ID_TABLE)
+                    curr = curr->parentNode();
+                malformedTableParent = curr ? curr->parentNode() : 0;
+            }
         }
         else
         {

-- 
WebKit Debian packaging