gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 21:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19695) -Fix: leaking a file descriptor

Browse Source
This commit is contained in:
rubidium 2010-04-22 18:34:45 +00:00
parent 8bc0231f98
commit 26af87bbaa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/network_server.cpp
View File

@ -322,7 +322,7 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP)
* nothing * nothing
*/ */
static FILE *file_pointer; static FILE *file_pointer = NULL;
static uint sent_packets; // How many packets we did send succecfully last time static uint sent_packets; // How many packets we did send succecfully last time
if (cs->status < STATUS_AUTHORIZED) { if (cs->status < STATUS_AUTHORIZED) {
@ -337,9 +337,12 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP)
/* Make a dump of the current game */ /* Make a dump of the current game */
if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) usererror("network savedump failed"); if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) usererror("network savedump failed");
file_pointer = FioFOpenFile(filename, "rb", AUTOSAVE_DIR); if (file_pointer != NULL) fclose(file_pointer);
fseek(file_pointer, 0, SEEK_END);
file_pointer = FioFOpenFile(filename, "rb", AUTOSAVE_DIR);
if (file_pointer == NULL) usererror("network savedump failed - could not open just saved dump");
fseek(file_pointer, 0, SEEK_END);
if (ftell(file_pointer) == 0) usererror("network savedump failed - zero sized savegame?"); if (ftell(file_pointer) == 0) usererror("network savedump failed - zero sized savegame?");
/* Now send the _frame_counter and how many packets are coming */ /* Now send the _frame_counter and how many packets are coming */
@ -382,6 +385,7 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP)
* to send it is ready (maybe that happens like never ;)) */ * to send it is ready (maybe that happens like never ;)) */
cs->status = STATUS_DONE_MAP; cs->status = STATUS_DONE_MAP;
fclose(file_pointer); fclose(file_pointer);
file_pointer = NULL;
NetworkClientSocket *new_cs; NetworkClientSocket *new_cs;
bool new_map_client = false; bool new_map_client = false;