Merge pull request #190 from eligovision/lanes_lua51_bugfix

Bug fix for Lua 5.1/LuaJIT: lua_getiuservalue must check if lua_getfe…

1 files changed, 20 insertions, 1 deletions

diff --git a/src/compat.c b/src/compat.c
index 9f36090..d9bc3dd 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -59,16 +59,35 @@ int lua_getiuservalue( lua_State* L, int idx, int n)
                 return LUA_TNONE;
         }
         lua_getuservalue( L, idx);
+
+#if LUA_VERSION_NUM == 501
+        /* default environment is not a nil (see lua_getfenv) */
+        lua_getglobal(L, "package");
+        if (lua_rawequal(L, -2, -1) || lua_rawequal(L, -2, LUA_GLOBALSINDEX))
+        {
+                lua_pop(L, 2);
+                lua_pushnil( L);
+
+                return LUA_TNONE;
+        }
+        lua_pop(L, 1);  /* remove package */
+#endif
+
         return lua_type( L, -1);
 }
 
 int lua_setiuservalue( lua_State* L, int idx, int n)
 {
-        if( n > 1)
+        if( n > 1
+#if LUA_VERSION_NUM == 501
+                || lua_type( L, -1) != LUA_TTABLE
+#endif
+                )
         {
                 lua_pop( L, 1);
                 return 0;
         }
+
         (void) lua_setuservalue( L, idx);
         return 1; // I guess anything non-0 is ok
 }