From 877666903d6beb85f78aa6ad3a7c4a8cc154cbb1 Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Wed, 1 Feb 2006 03:18:17 +0000 Subject: [PATCH] Fix a stupid mistake where an error return would cause us to not destroy a script. no bug, r=brendan --- js/src/jsobj.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/js/src/jsobj.c b/js/src/jsobj.c index d8563dc5860f..d2a65cbe376b 100644 --- a/js/src/jsobj.c +++ b/js/src/jsobj.c @@ -1266,10 +1266,9 @@ obj_eval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) */ ok = js_CheckPrincipalsAccess(cx, scopeobj, principals, cx->runtime->atomState.evalAtom); - if (!ok) - goto out; + if (ok) + ok = js_Execute(cx, scopeobj, script, caller, JSFRAME_EVAL, rval); - ok = js_Execute(cx, scopeobj, script, caller, JSFRAME_EVAL, rval); JS_DestroyScript(cx, script); out: @@ -2269,7 +2268,7 @@ js_FreeSlot(JSContext *cx, JSObject *obj, uint32 slot) #if JS_BUG_EMPTY_INDEX_ZERO #define CHECK_FOR_EMPTY_INDEX(id) \ JS_BEGIN_MACRO \ - if (JSSTRING_LENGTH(_str) == 0) \ + if (JSSTRING_LENGTH(str_) == 0) \ id = JSVAL_ZERO; \ JS_END_MACRO #else