Fixed: Cleaned up p_saveio init and shutdown

savefile was not always closed in the appropriate manner, leaving a pointer to freed memory.
skyjake · Jan 10, 2012 · 0915fd4 · 0915fd4
1 parent f736888
commit 0915fd4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/doomsday/plugins/common/src/p_saveg.c b/doomsday/plugins/common/src/p_saveg.c
@@ -4499,11 +4499,12 @@ void SV_Init(void)
 {
     static boolean firstInit = true;
 
+    SV_InitIO();
+
     inited = true;
     if(firstInit)
     {
         firstInit = false;
-        SV_InitIO();
         playerHeaderOK = false;
         thingArchive = NULL;
         thingArchiveSize = 0;
@@ -4514,7 +4515,6 @@ void SV_Init(void)
 #else
         numSoundTargets = 0;
 #endif
-
         // -1 = Not yet chosen/determined.
         cvarQuickSlot = -1;
     }
@@ -4735,7 +4735,7 @@ static boolean SV_LoadGame2(void)
 #endif
 
 #if !__JHEXEN__
-    lzClose(SV_File());
+    SV_CloseFile();
 #endif
 
     // We are done with the MaterialArchive.

diff --git a/doomsday/plugins/common/src/p_saveio.c b/doomsday/plugins/common/src/p_saveio.c
@@ -63,12 +63,15 @@ void SV_InitIO(void)
 #endif
     gameSaveInfo = NULL;
     inited = true;
+    savefile = 0;
 }
 
 void SV_ShutdownIO(void)
 {
     inited = false;
 
+    SV_CloseFile();
+
     if(gameSaveInfo)
     {
         int i;