mirror of
https://github.com/lua/lua
synced 2025-01-13 04:49:17 +03:00
'cpcall' must ensure correct environment for called function
This commit is contained in:
parent
d119cf3035
commit
ba21aa8b2b
7
lstate.c
7
lstate.c
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
** $Id: lstate.c,v 2.59 2009/09/21 12:09:52 roberto Exp roberto $
|
** $Id: lstate.c,v 2.60 2009/09/28 13:50:19 roberto Exp roberto $
|
||||||
** Global State
|
** Global State
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
@ -98,7 +98,10 @@ static void freestack (lua_State *L) {
|
|||||||
*/
|
*/
|
||||||
static int cpcall (lua_State *L) {
|
static int cpcall (lua_State *L) {
|
||||||
lua_CFunction f = *(lua_CFunction *)lua_touserdata(L, 1);
|
lua_CFunction f = *(lua_CFunction *)lua_touserdata(L, 1);
|
||||||
lua_remove(L, 1);
|
lua_remove(L, 1); /* remove f from stack */
|
||||||
|
/* restore original environment for 'cpcall' */
|
||||||
|
lua_pushvalue(L, LUA_GLOBALSINDEX);
|
||||||
|
lua_replace(L, LUA_ENVIRONINDEX);
|
||||||
return f(L);
|
return f(L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user