Skip to content
Snippets Groups Projects
Commit ff11afdb authored by rswindell's avatar rswindell
Browse files

js.eval() doesn't reset the branch counter (the calling script can do this if

they want to).
parent acff5372
No related branches found
No related tags found
No related merge requests found
...@@ -217,7 +217,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv ...@@ -217,7 +217,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
JSScript* script; JSScript* script;
JSContext* cx; JSContext* cx;
JSObject* obj; JSObject* obj;
js_branch_t* branch;
JSErrorReporter reporter; JSErrorReporter reporter;
#ifndef EVAL_BRANCH_CALLBACK #ifndef EVAL_BRANCH_CALLBACK
JSBranchCallback callback; JSBranchCallback callback;
...@@ -228,9 +227,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv ...@@ -228,9 +227,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
if(argc<1) if(argc<1)
return(JS_TRUE); 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) if((buf=JS_GetStringBytes(JS_ValueToString(parent_cx, argv[0])))==NULL)
return(JS_FALSE); return(JS_FALSE);
...@@ -243,7 +239,7 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv ...@@ -243,7 +239,7 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv
JS_SetErrorReporter(cx,reporter); JS_SetErrorReporter(cx,reporter);
#ifdef EVAL_BRANCH_CALLBACK #ifdef EVAL_BRANCH_CALLBACK
JS_SetContextPrivate(cx, branch); JS_SetContextPrivate(cx, JS_GetPrivate(parent_cx, parent_obj));
JS_SetBranchCallback(cx, js_BranchCallback); JS_SetBranchCallback(cx, js_BranchCallback);
#else /* Use the branch callback from the parent context */ #else /* Use the branch callback from the parent context */
JS_SetContextPrivate(cx, JS_GetContextPrivate(parent_cx)); JS_SetContextPrivate(cx, JS_GetContextPrivate(parent_cx));
...@@ -259,7 +255,6 @@ js_eval(JSContext *parent_cx, JSObject *parent_obj, uintN argc, jsval *argv, jsv ...@@ -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) { 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_ExecuteScript(cx, obj, script, rval);
JS_DestroyScript(cx, script); JS_DestroyScript(cx, script);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment