Bug 592829: Make parsing code able to deal with element creation failing. r=jst/peterv a=blocker

2010-10-04 18:25:44 -07:00
parent f71bf0faa7
commit a08866cdec
6 changed files with 61 additions and 9 deletions
--- a/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/parser/htmlparser/src/nsExpatDriver.cpp
@@ -1414,7 +1414,10 @@ nsExpatDriver::MaybeStopParser(nsresult aState)
        mInternalState == NS_ERROR_HTMLPARSER_INTERRUPTED ||
        (mInternalState == NS_ERROR_HTMLPARSER_BLOCK &&
         aState != NS_ERROR_HTMLPARSER_INTERRUPTED)) {
-      mInternalState = aState;
+      mInternalState = (aState == NS_ERROR_HTMLPARSER_INTERRUPTED ||
+                        aState == NS_ERROR_HTMLPARSER_BLOCK) ?
+                       aState :
+                       NS_ERROR_HTMLPARSER_STOPPARSING;
    }

    // If we get an error then we need to stop Expat (by calling XML_StopParser