libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LUA: Fix memleak of lua file descriptors

Browse Source 
- don't delete the common LuaFile objects (like g_fin, g_stdout, ...)
  separately
- don't delete the LuaFile objects in closefile()
- delete all LuaFile objects in g_files at once in lua_iolibclose()
- for some objects LuaFile::close() is called twice (once by closefile()
  and a second time by lua_iolibclose()) but this is uncritically due to
  the way LuaFile::close() is implemented
This commit is contained in:
Christian Krause 2014-12-31 01:46:05 +01:00
parent 4425493124
commit 8ba97cb063
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
engines/grim/lua/liolib.cpp
View File

@ -36,10 +36,6 @@ namespace Grim {
#define FINPUT "_INPUT"
#define FOUTPUT "_OUTPUT"
LuaFile *g_fin;
LuaFile *g_fout;
LuaFile *g_stdin;
LuaFile *g_stdout;
LuaFile *g_stderr;
static int32 s_id = 0;
@ -150,7 +146,6 @@ static void closefile(const char *name) {
f->close();
lua_pushobject(lua_getglobal(name));
lua_settag(gettag(CLOSEDTAG));
delete f;
}
static void setfile(int32 id, const char *name, int32 tag) {
@ -429,21 +424,22 @@ static void openwithtags() {
lua_setglobal(iolibtag[i].name);
}
g_fin = new LuaFile();
g_fin->_stdin = true;
setfile(addfile(g_fin), FINPUT, iotag);
LuaFile* f;
f = new LuaFile();
f->_stdin = true;
setfile(addfile(f), FINPUT, iotag);
g_fout = new LuaFile();
g_fout->_stdout = true;
setfile(addfile(g_fout), FOUTPUT, iotag);
f = new LuaFile();
f->_stdout = true;
setfile(addfile(f), FOUTPUT, iotag);
g_stdin = new LuaFile();
g_stdin->_stdin = true;
setfile(addfile(g_stdin), "_STDIN", iotag);
f = new LuaFile();
f->_stdin = true;
setfile(addfile(f), "_STDIN", iotag);
g_stdout = new LuaFile();
g_stdout->_stdout = true;
setfile(addfile(g_stdout), "_STDOUT", iotag);
f = new LuaFile();
f->_stdout = true;
setfile(addfile(f), "_STDOUT", iotag);
g_stderr = new LuaFile();
g_stderr->_stderr = true;
@ -461,12 +457,9 @@ void lua_iolibopen() {
}
void lua_iolibclose() {
delete g_fin;
delete g_fout;
delete g_stdin;
delete g_stdout;
delete g_stderr;
for (Common::HashMap<int32, LuaFile *>::iterator it = g_files->begin(); it != g_files->end(); ++it) {
delete it->_value;
}
delete g_files;
}