Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 5551fde

Browse files
committed
Revert "Merge pull request #316 from Dezash/feature/os-lib"
This reverts commit 94bd9c5, reversing changes made to 98e8454.
1 parent 94bd9c5 commit 5551fde

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

‎Client/mods/deathmatch/logic/lua/CLuaMain.cpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,6 @@ void CLuaMain::ResetInstructionCount(void)
7373

7474
void CLuaMain::InitSecurity(void)
7575
{
76-
// Disable dangerous Lua Os library functions
77-
static const luaL_reg osfuncs[] =
78-
{
79-
{ "execute", CLuaUtilDefs::DisabledFunction },
80-
{ "rename", CLuaUtilDefs::DisabledFunction },
81-
{ "remove", CLuaUtilDefs::DisabledFunction },
82-
{ "exit", CLuaUtilDefs::DisabledFunction },
83-
{ "getenv", CLuaUtilDefs::DisabledFunction },
84-
{ "tmpname", CLuaUtilDefs::DisabledFunction },
85-
{ NULL, NULL }
86-
};
87-
luaL_register(m_luaVM, "os", osfuncs);
88-
8976
lua_register(m_luaVM, "dofile", CLuaUtilDefs::DisabledFunction);
9077
lua_register(m_luaVM, "loadfile", CLuaUtilDefs::DisabledFunction);
9178
lua_register(m_luaVM, "require", CLuaUtilDefs::DisabledFunction);
@@ -154,7 +141,6 @@ void CLuaMain::InitVM(void)
154141
luaopen_table(m_luaVM);
155142
luaopen_debug(m_luaVM);
156143
luaopen_utf8(m_luaVM);
157-
luaopen_os(m_luaVM);
158144

159145
// Initialize security restrictions. Very important to prevent lua trojans and viruses!
160146
InitSecurity();

‎Server/mods/deathmatch/logic/lua/CLuaMain.cpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,6 @@ void CLuaMain::ResetInstructionCount(void)
108108

109109
void CLuaMain::InitSecurity(void)
110110
{
111-
// Disable dangerous Lua Os library functions
112-
static const luaL_reg osfuncs[] =
113-
{
114-
{ "execute", CLuaUtilDefs::DisabledFunction },
115-
{ "rename", CLuaUtilDefs::DisabledFunction },
116-
{ "remove", CLuaUtilDefs::DisabledFunction },
117-
{ "exit", CLuaUtilDefs::DisabledFunction },
118-
{ "getenv", CLuaUtilDefs::DisabledFunction },
119-
{ "tmpname", CLuaUtilDefs::DisabledFunction },
120-
{ NULL, NULL }
121-
};
122-
luaL_register(m_luaVM, "os", osfuncs);
123-
124111
lua_register(m_luaVM, "dofile", CLuaUtilDefs::DisabledFunction);
125112
lua_register(m_luaVM, "loadfile", CLuaUtilDefs::DisabledFunction);
126113
lua_register(m_luaVM, "require", CLuaUtilDefs::DisabledFunction);
@@ -185,7 +172,6 @@ void CLuaMain::InitVM(void)
185172
luaopen_table(m_luaVM);
186173
luaopen_debug(m_luaVM);
187174
luaopen_utf8(m_luaVM);
188-
luaopen_os(m_luaVM);
189175

190176
// Initialize security restrictions. Very important to prevent lua trojans and viruses!
191177
InitSecurity();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /