From f61641d25e279eecc4ab9fa86ce31025644afb99 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 28 Jul 2008 23:10:05 -0700
Subject: [PATCH] Bug 437723.  Make sure to look at the nested innermost URI
 when looking for the origin.  r+sr=sicking

---
 caps/src/nsScriptSecurityManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index 311ff2c27ff2..98799d8d541c 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -1044,7 +1044,9 @@ GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
   if (!uri) {
     aPrincipal->GetURI(getter_AddRefs(uri));
   }
+  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
 
+  uri = NS_GetInnermostURI(uri);
   NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
 
   nsCAutoString hostPort;