Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: Source/WebCore/xml/parser/XMLDocumentParser.cpp

Issue 11833048: Merge 138863 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/xml/parser/XMLDocumentParser.cpp
===================================================================
--- Source/WebCore/xml/parser/XMLDocumentParser.cpp (revision 139380)
+++ Source/WebCore/xml/parser/XMLDocumentParser.cpp (working copy)
@@ -194,6 +194,11 @@
doEnd();
+ // doEnd() call above can detach the parser and null out its document.
+ // In that case, we just bail out.
+ if (isDetached())
+ return;
+
// doEnd() could process a script tag, thus pausing parsing.
if (m_parserPaused)
return;
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698