Fixed assertion failures for abnormal shutdown during launch

skyjake · Dec 29, 2011 · a5c6991 · a5c6991
1 parent 666031a
commit a5c6991
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/doomsday/engine/portable/src/pathdirectory.c b/doomsday/engine/portable/src/pathdirectory.c
@@ -515,7 +515,8 @@ PathDirectory* PathDirectory_New(void)
 
 void PathDirectory_Delete(PathDirectory* pd)
 {
-    assert(pd);
+    if(!pd) return;
+
     clearPathHash(*hashAddressForNodeType(pd, PT_LEAF));
     destroyPathHash(pd, PT_LEAF);
 
@@ -556,6 +557,7 @@ PathDirectoryNode* PathDirectory_Insert(PathDirectory* pd, const char* path, cha
 int PathDirectory_Iterate2(PathDirectory* pd, int flags, PathDirectoryNode* parent,
     ushort hash, pathdirectory_iteratecallback_t callback, void* paramaters)
 {
+    if(!pd) return false;
     return iteratePaths(pd, flags, parent, hash, callback, paramaters);
 }
 

diff --git a/doomsday/engine/portable/src/textures.c b/doomsday/engine/portable/src/textures.c
@@ -463,7 +463,10 @@ void Textures_Shutdown(void)
     }
     textureIdMapSize = 0;
 
-    Uri_Delete(emptyUri), emptyUri = NULL;
+    if(emptyUri)
+    {
+        Uri_Delete(emptyUri), emptyUri = NULL;
+    }
 }
 
 texturenamespaceid_t Textures_ParseNamespace(const char* str)

diff --git a/doomsday/engine/portable/src/uri.c b/doomsday/engine/portable/src/uri.c
@@ -240,7 +240,7 @@ void Uri_Delete(Uri* uri)
 {
     if(!uri)
     {
-        Con_Error("Attempted Uri::Destruct with invalid reference (this==0).");
+        Con_Error("Attempted Uri::Delete with invalid reference (this==0).");
         return; // Unreachable.
     }
     Str_Free(&uri->_scheme);

diff --git a/doomsday/engine/unix/src/sys_audiod_loader.c b/doomsday/engine/unix/src/sys_audiod_loader.c
@@ -175,7 +175,7 @@ audiodriver_t* Sys_LoadAudioDriver(const char* name)
         }
         if(NULL == ad)
         {
-            Con_Message("Warning:Sys_LoadAudioDriver: Loading of \"%s\" failed.\n", Str_Text(&libPath));
+            Con_Message("Warning: Sys_LoadAudioDriver: Loading of \"%s\" failed.\n", Str_Text(&libPath));
         }
         Str_Free(&libPath);
     }

diff --git a/doomsday/engine/win32/src/sys_audiod_loader.c b/doomsday/engine/win32/src/sys_audiod_loader.c
@@ -169,7 +169,7 @@ audiodriver_t* Sys_LoadAudioDriver(const char* name)
         }
         if(NULL == ad)
         {
-            Con_Message("Warning:Sys_LoadAudioDriver: Loading of \"%s\" failed.\n", Str_Text(&libPath));
+            Con_Message("Warning: Sys_LoadAudioDriver: Loading of \"%s\" failed.\n", Str_Text(&libPath));
         }
         Str_Free(&libPath);
     }