gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: leaking file descriptors

Browse Source
This commit is contained in:
Rubidium 2021-05-09 23:00:36 +02:00 committed by rubidium42
parent 296194ad36
commit 495d73a67f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/console_cmds.cpp
View File

@ -939,6 +939,7 @@ DEF_CONSOLE_CMD(ConExec)
} }
if (_script_current_depth == 11) { if (_script_current_depth == 11) {
FioFCloseFile(script_file);
IConsoleError("Maximum 'exec' depth reached; script A is calling script B is calling script C ... more than 10 times."); IConsoleError("Maximum 'exec' depth reached; script A is calling script B is calling script C ... more than 10 times.");
return true; return true;
} }

10
src/network/network_content.cpp
View File

@ -410,7 +410,8 @@ static bool GunzipFile(const ContentInfo *ci)
FILE *ftmp = fopen(GetFullFilename(ci, true).c_str(), "rb"); FILE *ftmp = fopen(GetFullFilename(ci, true).c_str(), "rb");
if (ftmp == nullptr) return false; if (ftmp == nullptr) return false;
/* Duplicate the handle, and close the FILE*, to avoid double-closing the handle later. */ /* Duplicate the handle, and close the FILE*, to avoid double-closing the handle later. */
gzFile fin = gzdopen(dup(fileno(ftmp)), "rb"); int fdup = dup(fileno(ftmp));
gzFile fin = gzdopen(fdup, "rb");
fclose(ftmp); fclose(ftmp);
FILE *fout = fopen(GetFullFilename(ci, false).c_str(), "wb"); FILE *fout = fopen(GetFullFilename(ci, false).c_str(), "wb");
@ -449,7 +450,12 @@ static bool GunzipFile(const ContentInfo *ci)
} }
} }
if (fin != nullptr) gzclose(fin); if (fin != nullptr) {
gzclose(fin);
} else if (fdup != -1) {
/* Failing gzdopen does not close the passed file descriptor. */
close(fdup);
}
if (fout != nullptr) fclose(fout); if (fout != nullptr) fclose(fout);
return ret; return ret;