From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 24 Nov 2016 14:58:21 +0000 (-0500)
Subject: Fix secure io.open without mode
X-Git-Tag: 0.4.15~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e10f9f49a558050d36a49db619bf8f5eb3853c0;p=oweals%2Fminetest.git

Fix secure io.open without mode
---

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 3a8f724fe..5a64c249c 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -525,14 +525,19 @@ int ScriptApiSecurity::sl_g_require(lua_State *L)
 
 int ScriptApiSecurity::sl_io_open(lua_State *L)
 {
+	bool with_mode = lua_gettop(L) > 1;
+
 	luaL_checktype(L, 1, LUA_TSTRING);
 	const char *path = lua_tostring(L, 1);
 	CHECK_SECURE_PATH(L, path);
 
 	push_original(L, "io", "open");
 	lua_pushvalue(L, 1);
-	lua_pushvalue(L, 2);
-	lua_call(L, 2, 2);
+	if (with_mode) {
+		lua_pushvalue(L, 2);
+	}
+
+	lua_call(L, with_mode ? 2 : 1, 2);
 	return 2;
 }