autoland: changeset 491391:63cf143e208dc46c8a818628bad84bcfb970d000

author	Ehsan Akhgari <ehsan@mozilla.com>
	Tue, 03 Sep 2019 12:42:20 +0000
changeset 491391	63cf143e208dc46c8a818628bad84bcfb970d000
parent 491390	55349f2ab31bf370c0406c03dd04e1ba59341a2b
child 491392	9530fc5f5e325af59477a52119717a0821296c74
push id	94331
push user	eakhgari@mozilla.com
push date	Tue, 03 Sep 2019 14:14:17 +0000
treeherder	autoland@63cf143e208d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	johannh
bugs	1577558
milestone	71.0a1
first release with	nightly linux32 fd891e83a7cd / 71.0a1 / 20190903215623 / files nightly linux64 fd891e83a7cd / 71.0a1 / 20190903215623 / files nightly mac fd891e83a7cd / 71.0a1 / 20190903215623 / files nightly win32 fd891e83a7cd / 71.0a1 / 20190903215623 / files nightly win64 fd891e83a7cd / 71.0a1 / 20190903215623 / files
last release without	nightly linux32 08b1736b12e6 / 71.0a1 / 20190903094847 / files nightly linux64 08b1736b12e6 / 71.0a1 / 20190903094847 / files nightly mac 08b1736b12e6 / 71.0a1 / 20190903094847 / files nightly win32 08b1736b12e6 / 71.0a1 / 20190903094847 / files nightly win64 08b1736b12e6 / 71.0a1 / 20190903094847 / files

--- a/toolkit/components/antitracking/AntiTrackingCommon.cpp
+++ b/toolkit/components/antitracking/AntiTrackingCommon.cpp
@@ -1155,16 +1155,22 @@ RefPtr<mozilla::AntiTrackingCommon::Firs
 AntiTrackingCommon::SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
     nsIPrincipal* aParentPrincipal, nsIPrincipal* aTrackingPrincipal,
     const nsCString& aTrackingOrigin, const nsCString& aGrantedOrigin,
     int aAllowMode) {
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(aAllowMode == eAllow || aAllowMode == eAllowAutoGrant ||
              aAllowMode == eAllowOnAnySite);
 
+  if (!aParentPrincipal || !aTrackingPrincipal) {
+    LOG(("Invalid input arguments passed"));
+    return FirstPartyStorageAccessGrantPromise::CreateAndReject(false,
+                                                                __func__);
+  };
+
   nsCOMPtr<nsIURI> parentPrincipalURI;
   Unused << aParentPrincipal->GetURI(getter_AddRefs(parentPrincipalURI));
   LOG_SPEC(("Saving a first-party storage permission on %s for "
             "trackingOrigin=%s grantedOrigin=%s",
             _spec, aTrackingOrigin.get(), aGrantedOrigin.get()),
            parentPrincipalURI);
 
   if (NS_WARN_IF(!aParentPrincipal)) {