[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 9b203649af7ea60b3a284a54b1e44d200575ac70
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 25 00:37:35 2003 +0000

    	Fix for 3429646, <img src="blah"<img src="foo"> should show up as two images.
    
            Reviewed by darin
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::handleResidualStyleCloseTagAcrossBlocks):
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5049 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c7eeecc..1189c41 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-09-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3429646, <img src="blah"<img src="foo"> should show up as two images.
+	
+        Reviewed by darin
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::handleResidualStyleCloseTagAcrossBlocks):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2003-09-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c7eeecc..1189c41 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-09-24  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3429646, <img src="blah"<img src="foo"> should show up as two images.
+	
+        Reviewed by darin
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::handleResidualStyleCloseTagAcrossBlocks):
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2003-09-24  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 4285ad0..1d56eff 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1353,12 +1353,9 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
             // curr->id rather than the node that you should pop to when the element gets pulled off
             // the stack.
             popOneBlock(false);
-            curr->next = 0;
             curr->node = currNode;
-            if (!residualStyleStack)
-                residualStyleStack = curr;
-            else
-                residualStyleStack->next = curr;
+            curr->next = residualStyleStack;
+            residualStyleStack = curr;
         }
         else
             popOneBlock();
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index cea3892..02698d1 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -975,7 +975,7 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
             while(src.length()) {
                 curchar = *src;
                 if(curchar > ' ') {
-                    if(curchar == '>')
+                    if (curchar == '<' || curchar == '>')
                         tag = SearchEnd;
                     else if(atespace && (curchar == '\'' || curchar == '"'))
                     {
@@ -1215,7 +1215,7 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                 qDebug("SearchEnd");
 #endif
             while(src.length()) {
-                if(*src == '>')
+                if (*src == '>' || *src == '<')
                     break;
 
                 if (*src == '/')
@@ -1223,12 +1223,14 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
 
                 ++src;
             }
-            if(!src.length() && *src != '>') break;
+            if (!src.length() && *src != '>' && *src != '<') break;
 
             searchCount = 0; // Stop looking for '<!--' sequence
             tag = NoTag;
             tquote = NoQuote;
-            ++src;
+
+            if (*src != '<')
+                ++src;
 
             if ( !currToken.id ) //stop if tag is unknown
                 return;

-- 
WebKit Debian packaging