Fixed crash when passing bad arg to table.foreach

Also added a safety net to lua_getmetatable - someone crashed there?
MCJack123 · Mar 21, 2021 · 160b93c · 160b93c
1 parent a1e9550
commit 160b93c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lapi.c b/src/lapi.c
@@ -607,6 +607,7 @@ LUA_API int lua_getmetatable (lua_State *L, int objindex) {
     case LUA_TUSERDATA:
       mt = uvalue(obj)->metatable;
       break;
+    case LUA_TNONE: break;  /* safety net */
     default:
       mt = G(L)->mt[ttype(obj)];
       break;

diff --git a/src/ltablib.c b/src/ltablib.c
@@ -28,7 +28,7 @@ static int foreachi (lua_State *L) {
     goto resume;
   }
   n = aux_igetn(L, 1, -1);
-   luaL_checktype(L, 2, LUA_TFUNCTION);
+  luaL_checktype(L, 2, LUA_TFUNCTION);
   lua_settop(L, 2);
   lua_pushinteger(L, n);  /* cache n because aux_igetn may be expensive */
    for (i=1; i <= n; i++) {
@@ -47,6 +47,7 @@ static int foreachi (lua_State *L) {
 
 static int foreach (lua_State *L) {
   if (lua_vcontext(L)) goto resume;
+  luaL_checktype(L, 1, LUA_TTABLE);
   luaL_checktype(L, 2, LUA_TFUNCTION);
   lua_pushnil(L);  /* first key */
   while (lua_next(L, 1)) {