[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d555df174ac37307b646b2e8274a180b7cd3d103
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 15:34:22 2009 +0000

    [Qt] Fix assertion crashes introduced by changes made in r50110.
    
    Patch by Andras Becsi <becsi.andras at stud.u-szeged.hu> on 2009-10-27
    Reviewed by Tor Arne Vestbø.
    
    * dom/XMLTokenizerQt.cpp:
    (WebCore::XMLTokenizer::parseEndElement): only call popCurrentNode() if there are nodes left in the stack.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9bffda5..231264e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-27  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix assertion crashes introduced by changes made in r50110.
+
+        * dom/XMLTokenizerQt.cpp:
+        (WebCore::XMLTokenizer::parseEndElement): only call popCurrentNode() if there are nodes left in the stack.
+
 2009-10-27  Timothy Hatcher  <timothy at apple.com>
 
         Remove empty files that didn't get removed earlier.
diff --git a/WebCore/dom/XMLTokenizerQt.cpp b/WebCore/dom/XMLTokenizerQt.cpp
index 9758be7..c6e73ba 100644
--- a/WebCore/dom/XMLTokenizerQt.cpp
+++ b/WebCore/dom/XMLTokenizerQt.cpp
@@ -582,7 +582,8 @@ void XMLTokenizer::parseEndElement()
     n->finishParsingChildren();
 
     if (!n->isElementNode() || !m_view) {
-        popCurrentNode();
+        if (!m_currentNodeStack.isEmpty())
+            popCurrentNode();
         return;
     }
 

-- 
WebKit Debian packaging