浏览代码

in return hook, 'top' must be corrected only if smaller than 'ci->top'.
(It may be larger when returning multiple values, and then it must
be larger to preserve that stack slice.)

Roberto Ierusalimschy 7 年之前
父节点
当前提交
104d249ffb
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      ldo.c

+ 3 - 2
ldo.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 2.193 2018/02/09 15:16:06 roberto Exp roberto $
+** $Id: ldo.c,v 2.194 2018/02/15 15:34:29 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -316,7 +316,8 @@ static void rethook (lua_State *L, CallInfo *ci) {
     Proto *p = clLvalue(s2v(ci->func))->p;
     if (p->is_vararg)
       delta = ci->u.l.nextraargs + p->numparams + 1;
-    L->top = ci->top;  /* prepare top */
+    if (L->top < ci->top)
+      L->top = ci->top;  /* correct top */
   }
   if (L->hookmask & LUA_MASKRET) {  /* is return hook on? */
     ci->func += delta;  /* if vararg, back to virtual 'func' */