From 5da9812ebabe3b347d567e31442de29155f79efb Mon Sep 17 00:00:00 2001 From: "crowder%fiverocks.com" Date: Mon, 29 Jan 2007 04:18:49 +0000 Subject: [PATCH] 253125: script_exec ordering fix, r=brendan --- js/src/jsscript.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/js/src/jsscript.c b/js/src/jsscript.c index ac9d6cea272..e678ea4882d 100644 --- a/js/src/jsscript.c +++ b/js/src/jsscript.c @@ -261,16 +261,13 @@ out: static JSBool script_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - JSScript *script; JSObject *scopeobj, *parent; JSStackFrame *fp, *caller; JSPrincipals *principals; + JSScript *script; if (!JS_InstanceOf(cx, obj, &js_ScriptClass, argv)) return JS_FALSE; - script = (JSScript *) JS_GetPrivate(cx, obj); - if (!script) - return JS_TRUE; scopeobj = NULL; if (argc) { @@ -330,6 +327,10 @@ script_exec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) if (!scopeobj) return JS_FALSE; + script = (JSScript *) JS_GetPrivate(cx, obj); + if (!script) + return JS_TRUE; + /* Belt-and-braces: check that this script object has access to scopeobj. */ principals = script->principals; if (!js_CheckPrincipalsAccess(cx, scopeobj, principals,