Bug 302100 I just downloaded Firefox 1.06, and it crashes at 004A6170 whenever I try to view any page [@ nsJSPrincipalsSubsume] using PAC

r=mrbkap sr=shaver a=bsmedberg

js/src/jsobj.c

@@ -1128,7 +1128,8 @@ obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         rt = cx->runtime;
         if (rt->findObjectPrincipals) {
             scopePrincipals = rt->findObjectPrincipals(cx, scopeobj);
-            if (!principals->subsume(principals, scopePrincipals)) {
+            if (scopePrincipals &&
+                !principals->subsume(principals, scopePrincipals)) {
                 JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
                                      JSMSG_BAD_INDIRECT_CALL, js_eval_str);
                 return JS_FALSE;

js/src/jsscript.c

@@ -306,7 +306,8 @@ script_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         rt = cx->runtime;
         if (rt->findObjectPrincipals) {
             scopePrincipals = rt->findObjectPrincipals(cx, scopeobj);
-            if (!principals->subsume(principals, scopePrincipals)) {
+            if (scopePrincipals &&
+                !principals->subsume(principals, scopePrincipals)) {
                 JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
                                      JSMSG_BAD_INDIRECT_CALL,
                                      "Script.prototype.exec");