[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 2be7fc0f86302dde71c076c75d41d28bfbde5bd5
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 22:05:04 2010 +0000

            Reviewed by Adele Peterson.
    
            https://bugs.webkit.org/show_bug.cgi?id=35044
            Crash in XML tokenizer reloading zoom-coords-viewattr-01-b.svg
    
            I'm often getting a crash even when opening the test for the first time in Safari, but it
            doesn't seem to crash in DumpRenderTree. Still, I can't think of a stronger way to test for
            this condition, so no new regression test.
    
            * dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::end): Be prepared that parsing remaining
            input will pause parsing.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6581f2d..6005763 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-03  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35044
+        Crash in XML tokenizer reloading zoom-coords-viewattr-01-b.svg
+
+        I'm often getting a crash even when opening the test for the first time in Safari, but it
+        doesn't seem to crash in DumpRenderTree. Still, I can't think of a stronger way to test for
+        this condition, so no new regression test.
+
+        * dom/XMLTokenizer.cpp: (WebCore::XMLTokenizer::end): Be prepared that parsing remaining
+        input will pause parsing.
+
 2010-03-03  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp
index 1c43322..0e02d4e 100644
--- a/WebCore/dom/XMLTokenizer.cpp
+++ b/WebCore/dom/XMLTokenizer.cpp
@@ -206,7 +206,11 @@ void XMLTokenizer::exitText()
 void XMLTokenizer::end()
 {
     doEnd();
-    
+
+    // doEnd() could process a script tag, thus pausing parsing.
+    if (m_parserPaused)
+        return;
+
     if (m_sawError)
         insertErrorMessageBlock();
     else {

-- 
WebKit Debian packaging