From 578b88bc6a9af1e4a2258bbd9ae54d07daa8718b Mon Sep 17 00:00:00 2001 From: Matthew Noorenberghe Date: Fri, 25 Sep 2015 16:10:56 -0700 Subject: [PATCH] Bug 1205399 - Fix OS X crash when no alert principal is passed. r=bustage --HG-- extra : commitid : 9mTknYl7SCs extra : rebase_source : 0d8be9c99ac06dc2870ea009e71c892435384c12 --- widget/cocoa/OSXNotificationCenter.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm index af0c98e22446..3ada98a7bd14 100644 --- a/widget/cocoa/OSXNotificationCenter.mm +++ b/widget/cocoa/OSXNotificationCenter.mm @@ -248,7 +248,7 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const notification.hasActionButton = NO; // If this is not an application/extension alert, show additional actions dealing with permissions. - if (!nsContentUtils::IsSystemOrExpandedPrincipal(aPrincipal) + if (aPrincipal && !nsContentUtils::IsSystemOrExpandedPrincipal(aPrincipal) && !aPrincipal->GetIsNullPrincipal()) { nsCOMPtr sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID); nsCOMPtr bundle;