lua

commit 6d8d282e0f6fc74f2499a9ab3971613115fdf0f9
parent 00c8a17a2da8fbeaf5b5542c0b7a0c4dd4fdfc91
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Sun,  6 Nov 2011 11:58:48 -0200

avoid calling "extra value" as if it were a function option

Diffstat:
M
loadlib.c
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/loadlib.c b/loadlib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c,v 1.99 2011/06/28 17:13:28 roberto Exp roberto $
+** $Id: loadlib.c,v 1.100 2011/07/05 12:49:35 roberto Exp roberto $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -516,9 +516,11 @@ static void set_env (lua_State *L) {
 static void dooptions (lua_State *L, int n) {
   int i;
   for (i = 2; i <= n; i++) {
-    lua_pushvalue(L, i);  /* get option (a function) */
-    lua_pushvalue(L, -2);  /* module */
-    lua_call(L, 1, 0);
+    if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
+      lua_pushvalue(L, i);  /* get option (a function) */
+      lua_pushvalue(L, -2);  /* module */
+      lua_call(L, 1, 0);
+    }
   }
 }