nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'loadin' should accept any value for the environment (not only tables) +

Browse Source 
it should check whether chunk has upvalue named '_ENV'
This commit is contained in:
Roberto Ierusalimschy
2010-08-23 15:03:11 -03:00
parent 8d9ea59d28
commit daa5fe3e31
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lbaselib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.245 2010/06/13 19:41:34 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.246 2010/07/02 11:38:13 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -330,11 +330,14 @@ static int luaB_load (lua_State *L) {
static int luaB_loadin (lua_State *L) { static int luaB_loadin (lua_State *L) {
int n; int n;
luaL_checktype(L, 1, LUA_TTABLE); luaL_checkany(L, 1);
n = luaB_load_aux(L, 2); n = luaB_load_aux(L, 2);
if (n == 1) { /* success? */ if (n == 1) { /* success? */
const char *name;
lua_pushvalue(L, 1); /* environment for loaded function */ lua_pushvalue(L, 1); /* environment for loaded function */
lua_setupvalue(L, -2, 1); name = lua_setupvalue(L, -2, 1);
if (name == NULL || strcmp(name, "_ENV") != 0)
luaL_error(L, "loaded chunk does not have environment upvalue");
} }
return n; return n;
} }