Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reload onbranch after possible native function calls (241050, r=shaver).

Browse Source
This commit is contained in:
brendan%mozilla.org 2004-04-30 02:43:50 +00:00
parent 394a8fe8c0
commit 2521542a8a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsinterp.c
View File

@ -1794,9 +1794,12 @@ js_Interpret(JSContext *cx, jsval *result)
/*
* Prepare to call a user-supplied branch handler, and abort the script
* if it returns false.
* if it returns false. We reload onbranch after calling out to native
* functions (but not to getters, setters, or other native hooks).
*/
onbranch = cx->branchCallback;
#define LOAD_BRANCH_CALLBACK(cx) (onbranch = (cx)->branchCallback)
LOAD_BRANCH_CALLBACK(cx);
ok = JS_TRUE;
#define CHECK_BRANCH(len) \
JS_BEGIN_MACRO \
@ -2938,6 +2941,7 @@ js_Interpret(JSContext *cx, jsval *result)
SAVE_SP(fp);
ok = js_Invoke(cx, argc, JSINVOKE_CONSTRUCT);
RESTORE_SP(fp);
LOAD_BRANCH_CALLBACK(cx);
LOAD_INTERRUPT_HANDLER(rt);
if (!ok) {
cx->newborn[GCX_OBJECT] = NULL;
@ -3365,6 +3369,7 @@ js_Interpret(JSContext *cx, jsval *result)
ok = js_Invoke(cx, argc, 0);
RESTORE_SP(fp);
LOAD_BRANCH_CALLBACK(cx);
LOAD_INTERRUPT_HANDLER(rt);
if (!ok)
goto out;
@ -3401,6 +3406,7 @@ js_Interpret(JSContext *cx, jsval *result)
SAVE_SP(fp);
ok = js_Invoke(cx, argc, 0);
RESTORE_SP(fp);
LOAD_BRANCH_CALLBACK(cx);
LOAD_INTERRUPT_HANDLER(rt);
if (!ok)
goto out;