wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-03 05:47:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add a check to prevent a crash when CSP directives are used with chrome content

Browse source 
Chrome content uses System Principle and this kind of speculative preloading of CSP just won't work.
This commit is contained in:
NTD 2018-06-02 09:44:18 -04:00 • committed by Roy Tam
commit 53005879e6
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
parser/html/nsHtml5TreeOpExecutor.cpp
View file

@ -1041,12 +1041,17 @@ nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP)
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
nsIPrincipal* principal = mDocument->NodePrincipal(); nsCOMPtr<nsIPrincipal> principal = mDocument->NodePrincipal();
nsCOMPtr<nsIContentSecurityPolicy> preloadCsp; nsCOMPtr<nsIContentSecurityPolicy> preloadCsp;
nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(mDocument); nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(mDocument);
nsresult rv = principal->EnsurePreloadCSP(domDoc, getter_AddRefs(preloadCsp)); nsresult rv = principal->EnsurePreloadCSP(domDoc, getter_AddRefs(preloadCsp));
NS_ENSURE_SUCCESS_VOID(rv); NS_ENSURE_SUCCESS_VOID(rv);
if (!preloadCsp) {
// XXX: System principals can't preload CSP. We're done here.
return;
}
// please note that meta CSPs and CSPs delivered through a header need // please note that meta CSPs and CSPs delivered through a header need
// to be joined together. // to be joined together.
rv = preloadCsp->AppendPolicy(aCSP, rv = preloadCsp->AppendPolicy(aCSP,