From 8372f17aac4e8553a99ad1cea9c8f75c2dbab4f6 Mon Sep 17 00:00:00 2001
From: "mrbkap%gmail.com"
 <mrbkap%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Jun 2007 23:50:28 +0000
Subject: [PATCH] Allow C.u.Sandbox to take a principal or an
 nsIScriptObjectPrincipal. bug 353732, r+sr=jst

git-svn-id: svn://10.0.0.236/trunk@228094 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/xpconnect/src/xpccomponents.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mozilla/js/src/xpconnect/src/xpccomponents.cpp b/mozilla/js/src/xpconnect/src/xpccomponents.cpp
index 26832bde8d5..959acd51e0a 100644
--- a/mozilla/js/src/xpconnect/src/xpccomponents.cpp
+++ b/mozilla/js/src/xpconnect/src/xpccomponents.cpp
@@ -3309,8 +3309,12 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
 
             if (wrapper) {
                 sop = do_QueryWrappedNative(wrapper);
-
-                prinOrSop = sop;
+                if (sop) {
+                    prinOrSop = sop;
+                } else {
+                    principal = do_QueryWrappedNative(wrapper);
+                    prinOrSop = principal;
+                }
             }
         }