bug: interpreter cannot pop activation frame before calling return

hook (as it may want to access local variables active by the end
of the function)

1 files changed, 2 insertions, 3 deletions

diff --git a/lvm.c b/lvm.c
index 08aaf13f..27cb9957 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.c,v 2.241 2015/05/20 16:22:55 roberto Exp roberto $
+** $Id: lvm.c,v 2.242 2015/05/20 18:19:11 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -1106,9 +1106,8 @@ void luaV_execute (lua_State *L) {
       }
       vmcase(OP_RETURN) {
         int b = GETARG_B(i);
-        if (b != 0) L->top = ra+b-1;
         if (cl->p->sizep > 0) luaF_close(L, base);
-        b = luaD_poscall(L, ra);
+        b = luaD_poscall(L, ra, (b != 0 ? b - 1 : L->top - ra));
         if (!(ci->callstatus & CIST_REENTRY))  /* 'ci' still the called one */
           return;  /* external invocation: return */
         else {  /* invocation via reentry: continue execution */