summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp')
-rw-r--r--src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp b/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp
index ae6702b4f..dd5ca7675 100644
--- a/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp
+++ b/src/3rdparty/webkit/WebCore/loader/DocumentThreadableLoader.cpp
@@ -164,7 +164,8 @@ void DocumentThreadableLoader::didFinishLoading(SubresourceLoader* loader)
void DocumentThreadableLoader::didFail(SubresourceLoader* loader, const ResourceError& error)
{
ASSERT(m_client);
- ASSERT_UNUSED(loader, loader == m_loader);
+ // m_loader may be null if we arrive here via SubresourceLoader::create in the ctor
+ ASSERT_UNUSED(loader, loader == m_loader || !m_loader);
m_client->didFail(error);
}