From eb2c4022951e7d77be6ecc433992df7659288314 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 24 Nov 2014 21:43:11 +0100
Subject: [PATCH] Bug 1104193 - nullcheck in nsContentUtils::GetASCIIOrigin,
 r=smaug

---
 dom/base/nsContentUtils.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 9ccff26ef9ed..d17cde71837c 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -5757,12 +5757,14 @@ nsContentUtils::GetASCIIOrigin(nsIURI* aURI, nsCString& aOrigin)
     nsCOMPtr<nsIPrincipal> principal;
     uriWithPrincipal->GetPrincipal(getter_AddRefs(principal));
 
-    nsCOMPtr<nsIURI> uri;
-    nsresult rv = principal->GetURI(getter_AddRefs(uri));
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (principal) {
+      nsCOMPtr<nsIURI> uri;
+      nsresult rv = principal->GetURI(getter_AddRefs(uri));
+      NS_ENSURE_SUCCESS(rv, rv);
 
-    if (uri && uri != aURI) {
-      return GetASCIIOrigin(uri, aOrigin);
+      if (uri && uri != aURI) {
+        return GetASCIIOrigin(uri, aOrigin);
+      }
     }
   }