lua

commit ba21aa8b2b29f516f1f488f996fc899c62f7105b
parent d119cf30350593caa4bebdc5c4e3123f3cd269e0
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Wed, 30 Sep 2009 17:49:23 -0300

'cpcall' must ensure correct environment for called function

Diffstat:
M
lstate.c
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lstate.c b/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
 ** See Copyright Notice in lua.h
 */
@@ -98,7 +98,10 @@ static void freestack (lua_State *L) {
 */
 static int cpcall (lua_State *L) {
   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);
 }