Bug 1336802 - Part 1: Fixing the crash of nsILoadInfo::GetOriginAttributes. r?smaug
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7942,18 +7942,20 @@ nsDocShell::EndPageLoad(nsIWebProgress*
if (!(mLoadType & LOAD_CMD_HISTORY)) {
aStatus = NS_ERROR_OFFLINE;
}
DisplayLoadError(aStatus, url, nullptr, aChannel);
}
} else if (url && NS_SUCCEEDED(aStatus)) {
// If we have a host
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
- mozilla::net::PredictorLearnRedirect(url, aChannel,
- loadInfo->GetOriginAttributes());
+ if (loadInfo) {
+ mozilla::net::PredictorLearnRedirect(url, aChannel,
+ loadInfo->GetOriginAttributes());
+ }
}
return NS_OK;
}
//*****************************************************************************
// nsDocShell: Content Viewer Management
//*****************************************************************************