Merge branch 'develop' into adv-beta

DFHack · Jun 27, 2024 · 6686ca8 · 6686ca8
2 parents bc232a0 + 0ca0f4d
commit 6686ca8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/depends/luacov b/depends/luacov
diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
@@ -1898,13 +1898,11 @@ lua_State *DFHack::Lua::Open(color_ostream &out, lua_State *state)
     luaL_setfuncs(state, dfhack_coro_funcs, 0);
     lua_pop(state, 1);
 
-    // remove some io functions (if coverage monitoring, which needs them, is not enabled)
-    if (!getenv("DFHACK_ENABLE_LUACOV")) {
-        lua_getglobal(state, "io");
-        lua_pushnil(state);
-        lua_setfield(state, -2, "popen");
-        lua_pop(state, 1);
-    }
+    // DFHack should not be running external processes (security hardening measure)
+    lua_getglobal(state, "io");
+    lua_pushnil(state);
+    lua_setfield(state, -2, "popen");
+    lua_pop(state, 1);
 
     // replace some os functions
     lua_getglobal(state, "os");

diff --git a/scripts b/scripts