aboutsummaryrefslogtreecommitdiff
path: root/lvm.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2018-02-17 17:20:00 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2018-02-17 17:20:00 -0200
commit49dae52d0808776f5861eb33efa1d13b05e44512 (patch)
tree6f2f5578539ff00b6957522e3909293ce6de58ee /lvm.c
parent104d249ffbf76828caa5e204979f5ddad45f2bcb (diff)
downloadlua-49dae52d0808776f5861eb33efa1d13b05e44512.tar.gz
lua-49dae52d0808776f5861eb33efa1d13b05e44512.tar.bz2
lua-49dae52d0808776f5861eb33efa1d13b05e44512.zip
correct way to check stack space for vararg functions
Diffstat (limited to 'lvm.c')
-rw-r--r--lvm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lvm.c b/lvm.c
index 0cc3a0b9..0ba6b4bc 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lvm.c,v 2.339 2018/02/09 15:16:06 roberto Exp roberto $ 2** $Id: lvm.c,v 2.340 2018/02/15 15:34:29 roberto Exp roberto $
3** Lua virtual machine 3** Lua virtual machine
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -1713,13 +1713,13 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
1713 vmbreak; 1713 vmbreak;
1714 } 1714 }
1715 vmcase(OP_PREPVARARG) { 1715 vmcase(OP_PREPVARARG) {
1716 luaT_adjustvarargs(L, GETARG_A(i), ci); 1716 luaT_adjustvarargs(L, GETARG_A(i), ci, cl->p);
1717 updatetrap(ci); 1717 updatetrap(ci);
1718 if (trap) { 1718 if (trap) {
1719 luaD_hookcall(L, ci); 1719 luaD_hookcall(L, ci);
1720 L->oldpc = pc + 1; /* next opcode will be seen as a new line */ 1720 L->oldpc = pc + 1; /* next opcode will be seen as a "new" line */
1721 } 1721 }
1722 updatebase(ci); 1722 updatebase(ci); /* function has new base after adjustment */
1723 vmbreak; 1723 vmbreak;
1724 } 1724 }
1725 vmcase(OP_EXTRAARG) { 1725 vmcase(OP_EXTRAARG) {