[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 e6993f2e423a2e7b598e9be0bb9a57f7679d5cec
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 3 20:43:34 2003 +0000

    	Fix for 3404398, leak in residual style code.  The code that built up the
    	residualStyleStack was messed up and discarded tags.
    
            Reviewed by mjs
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::popBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 26d9d2c..4a066c7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3404398, leak in residual style code.  The code that built up the
+	residualStyleStack was messed up and discarded tags.
+	
+        Reviewed by mjs
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::popBlock):
+
 2003-09-02  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 26d9d2c..4a066c7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3404398, leak in residual style code.  The code that built up the
+	residualStyleStack was messed up and discarded tags.
+	
+        Reviewed by mjs
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::popBlock):
+
 2003-09-02  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 0cb08c6..4285ad0 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1493,12 +1493,9 @@ void KHTMLParser::popBlock( int _id )
                 // Elem->id rather than the node that you should pop to when the element gets pulled off
                 // the stack.
                 popOneBlock(false);
-                Elem->next = 0;
+                Elem->next = residualStyleStack;
                 Elem->node = currNode;
-                if (!residualStyleStack)
-                    residualStyleStack = Elem;
-                else
-                    residualStyleStack->next = Elem;
+                residualStyleStack = Elem;
             }
             else
                 popOneBlock();

-- 
WebKit Debian packaging