Browse Source

Merge branch 'fix-call-act-relookup'

add-comment-stripped-dist-source
Sami Vaarala 9 years ago
parent
commit
dfc66cd923
  1. 3
      RELEASES.rst
  2. 2
      src/duk_js_call.c

3
RELEASES.rst

@ -1061,6 +1061,9 @@ Planned
DUK_USE_xxx config options for native recursion limits; C stacks are assumed
to be deep by default for all targets (GH-165)
* Fix missing activation lookup from call handling after an Arguments object
was created, this could in theory lead to memory unsafe behavior (GH-305)
* Fix debugger GetCallStack line number handling for callstack entries below
the callstack top (GH-281)

2
src/duk_js_call.c

@ -1313,6 +1313,7 @@ duk_int_t duk_handle_call(duk_hthread *thr,
/* [... func this arg1 ... argN envobj] */
act = thr->callstack + thr->callstack_top - 1;
act->lex_env = env;
act->var_env = env;
DUK_HOBJECT_INCREF(thr, env);
@ -2426,6 +2427,7 @@ duk_bool_t duk_handle_ecma_call_setup(duk_hthread *thr,
/* [... arg1 ... argN envobj] */
act = thr->callstack + thr->callstack_top - 1;
act->lex_env = env;
act->var_env = env;
DUK_HOBJECT_INCREF(thr, act->lex_env);

Loading…
Cancel
Save