sky/engine/core/html/imports/HTMLImportLoader.cpp - Issue 682913002: Don't crash when importing a 404

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sky/engine/core/html/imports/HTMLImportLoader.cpp

Issue 682913002: Don't crash when importing a 404 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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:

Index: sky/engine/core/html/imports/HTMLImportLoader.cpp

diff --git a/sky/engine/core/html/imports/HTMLImportLoader.cpp b/sky/engine/core/html/imports/HTMLImportLoader.cpp

index a96b38566d3d8585355e4dbf303b73841ae0542a..22e5b599bc106dc1a677dbc5a99b187963a78ad9 100644

--- a/sky/engine/core/html/imports/HTMLImportLoader.cpp

+++ b/sky/engine/core/html/imports/HTMLImportLoader.cpp

@@ -121,8 +121,10 @@ void HTMLImportLoader::setState(State state)

m_state = state;

- if (m_state == StateParsed || m_state == StateError || m_state == StateWritten)

- m_document->cancelParsing();

+ if (m_state == StateParsed || m_state == StateError || m_state == StateWritten) {

+ if (m_document)

+ m_document->cancelParsing();

+ }

// Since DocumentWriter::end() can let setState() reenter, we shouldn't refer to m_state here.

if (state == StateLoaded || state == StateError)