corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 559231 - Don't assert if there's no code running. r=jst

Browse Source
This commit is contained in:
Blake Kaplan
2010-04-27 16:24:18 -07:00
parent 67b92eb4d4
commit 3fd3f931f7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/xpconnect/src/xpccomponents.cpp
View File

@@ -3556,10 +3556,12 @@ xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source,
{ {
nsIScriptSecurityManager *ssm = XPCWrapper::GetSecurityManager(); nsIScriptSecurityManager *ssm = XPCWrapper::GetSecurityManager();
if (ssm) { if (ssm) {
nsIPrincipal *subjectPrincipal = ssm->GetCxSubjectPrincipal(cx); JSStackFrame *fp;
nsIPrincipal *subjectPrincipal =
ssm->GetCxSubjectPrincipalAndFrame(cx, &fp);
PRBool system; PRBool system;
ssm->IsSystemPrincipal(subjectPrincipal, &system); ssm->IsSystemPrincipal(subjectPrincipal, &system);
NS_ASSERTION(system, "Bad caller!"); NS_ASSERTION(!fp || system, "Bad caller!");
} }
} }
#endif #endif