From ff11afdb032dfab0f4429c78ff098d3b8b279087 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 15 Oct 2003 06:29:26 +0000
Subject: [PATCH] js.eval() doesn't reset the branch counter (the calling
script can do this if they want to).
---
src/sbbs3/js_internal.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c
index f1b77b22e2..04404090d6 100644
--- a/src/sbbs3/js_internal.c
+++ b/src/sbbs3/js_internal.c
@@ -217,7 +217,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
JSScript* script;
JSContext* cx;
JSObject* obj;
- js_branch_t* branch;
JSErrorReporter reporter;
#ifndef EVAL_BRANCH_CALLBACK
JSBranchCallback callback;
@@ -228,9 +227,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
if(argc<1)
return(JS_TRUE);
- if((branch=(js_branch_t*)JS_GetPrivate(parent_cx, parent_obj))==NULL)
- return(JS_FALSE);
-
if((buf=JS_GetStringBytes(JS_ValueToString(parent_cx, argv[0])))==NULL)
return(JS_FALSE);
@@ -243,7 +239,7 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
JS_SetErrorReporter(cx,reporter);
#ifdef EVAL_BRANCH_CALLBACK
- JS_SetContextPrivate(cx, branch);
+ JS_SetContextPrivate(cx, JS_GetPrivate(parent_cx, parent_obj));
JS_SetBranchCallback(cx, js_BranchCallback);
#else /* Use the branch callback from the parent context */
JS_SetContextPrivate(cx, JS_GetContextPrivate(parent_cx));
@@ -259,7 +255,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
}
if((script=JS_CompileScript(cx, obj, buf, strlen(buf), NULL, 0))!=NULL) {
- branch->counter=0; /* Reset loop counter */
JS_ExecuteScript(cx, obj, script, rval);
JS_DestroyScript(cx, script);
}
--
GitLab