[cig-commits] r6213 - in long/3D/Gale/trunk: . src/StGermain/libStGermain/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-09 13:34:09 -0800 (Fri, 09 Mar 2007)
New Revision: 6213

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/libStGermain/src/Finalise.c
Log:
 r1678 at earth:  boo | 2007-03-09 13:30:35 -0800
 fix a crash on exit because trying to free pluginsDirectories and xmlSearchPaths, which are NULL



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1677
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1678

Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/src/Finalise.c	2007-03-09 21:34:04 UTC (rev 6212)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/src/Finalise.c	2007-03-09 21:34:09 UTC (rev 6213)
@@ -40,11 +40,16 @@
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	/*Delete the global objects : xmlSearchPaths and pluginDirectories */
-	Stg_ObjectList_DeleteAllObjects( pluginDirectories );
-	Stg_Class_Delete( pluginDirectories );
-	
-	Stg_ObjectList_DeleteAllObjects(xmlSearchPaths);
-	Stg_Class_Delete( xmlSearchPaths );
+        if(pluginDirectories!=NULL)
+          {
+            Stg_ObjectList_DeleteAllObjects( pluginDirectories );
+            Stg_Class_Delete( pluginDirectories );
+          }
+	if(xmlSearchPaths!=NULL)
+          {
+            Stg_ObjectList_DeleteAllObjects(xmlSearchPaths);
+            Stg_Class_Delete( xmlSearchPaths );
+          }
 
 	Discretisation_Finalise();
 	Base_Finalise();