From ac0a9f144e8623e35c17616321a51d343f0ed7ec Mon Sep 17 00:00:00 2001 From: Roy Tam Date: Fri, 24 Jan 2020 06:40:47 +0800 Subject: [PATCH] nsContentSecurityManager::CheckFTPSubresourceLoad: fix crash when viewing HTML in FTP site --- dom/security/nsContentSecurityManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index 5c6701992f..e8acbf7225 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -139,6 +139,9 @@ nsContentSecurityManager::CheckFTPSubresourceLoad(nsIChannel* aChannel) nsIPrincipal* triggeringPrincipal = loadInfo->TriggeringPrincipal(); nsCOMPtr tURI; triggeringPrincipal->GetURI(getter_AddRefs(tURI)); + if(!tURI) { + return NS_OK; + } bool isTrigFtpURI = (NS_SUCCEEDED(tURI->SchemeIs("ftp", &isTrigFtpURI)) && isTrigFtpURI); if (isTrigFtpURI) { return NS_OK;