Bug 1583076 - Initialize cspToInherit with the loading context when deserializing. r=ckerschb

mattwoodrow · mattwoodrow · commit 507bc7d9ba80 · 2019-09-25T08:25:20.000Z
Differential Revision: https://phabricator.services.mozilla.com/D46739 --HG-- extra : moz-landing-system : lando
diff --git a/ipc/glue/BackgroundUtils.cpp b/ipc/glue/BackgroundUtils.cpp
@@ -738,7 +738,8 @@ nsresult LoadInfoArgsToLoadInfo(
   Maybe<mozilla::ipc::CSPInfo> cspToInheritInfo =
       loadInfoArgs.cspToInheritInfo();
   if (cspToInheritInfo.isSome()) {
-    cspToInherit = CSPInfoToCSP(cspToInheritInfo.ref(), nullptr);
+    nsCOMPtr<Document> doc = do_QueryInterface(aLoadingContext);
+    cspToInherit = CSPInfoToCSP(cspToInheritInfo.ref(), doc);
   }
 
   RefPtr<mozilla::LoadInfo> loadInfo = new mozilla::LoadInfo(

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,8 @@ nsresult LoadInfoArgsToLoadInfo(`
`738`	`738`	`Maybe<mozilla::ipc::CSPInfo> cspToInheritInfo =`
`739`	`739`	`loadInfoArgs.cspToInheritInfo();`
`740`	`740`	`if (cspToInheritInfo.isSome()) {`
`741`		`- cspToInherit = CSPInfoToCSP(cspToInheritInfo.ref(), nullptr);`
	`741`	`+ nsCOMPtr<Document> doc = do_QueryInterface(aLoadingContext);`
	`742`	`+ cspToInherit = CSPInfoToCSP(cspToInheritInfo.ref(), doc);`
`742`	`743`	`}`
`743`	`744`
`744`	`745`	`RefPtr<mozilla::LoadInfo> loadInfo = new mozilla::LoadInfo(`