[GRASS-SVN] r41313 - in grass/trunk/gui/wxpython: nviz vdigit

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Mar 6 14:12:28 EST 2010


Author: martinl
Date: 2010-03-06 14:12:28 -0500 (Sat, 06 Mar 2010)
New Revision: 41313

Modified:
   grass/trunk/gui/wxpython/nviz/init.cpp
   grass/trunk/gui/wxpython/nviz/surface.cpp
   grass/trunk/gui/wxpython/vdigit/driver_draw.cpp
   grass/trunk/gui/wxpython/vdigit/line.cpp
Log:
set variable to NULL after freeing
(merge r41311 from relbr64)


Modified: grass/trunk/gui/wxpython/nviz/init.cpp
===================================================================
--- grass/trunk/gui/wxpython/nviz/init.cpp	2010-03-06 19:09:09 UTC (rev 41312)
+++ grass/trunk/gui/wxpython/nviz/init.cpp	2010-03-06 19:12:28 UTC (rev 41313)
@@ -150,6 +150,7 @@
 	
 	PyFile_WriteString(sentence, pyFd);
 	G_free((void *)sentence);
+	sentence = NULL;
 	
 	PyFile_WriteString("\n", pyFd);
 	start = next;

Modified: grass/trunk/gui/wxpython/nviz/surface.cpp
===================================================================
--- grass/trunk/gui/wxpython/nviz/surface.cpp	2010-03-06 19:09:09 UTC (rev 41312)
+++ grass/trunk/gui/wxpython/nviz/surface.cpp	2010-03-06 19:12:28 UTC (rev 41313)
@@ -346,6 +346,7 @@
 	}
 
 	G_free(surf_list);
+	surf_list = NULL;
     }
 
     return 1;

Modified: grass/trunk/gui/wxpython/vdigit/driver_draw.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/driver_draw.cpp	2010-03-06 19:09:09 UTC (rev 41312)
+++ grass/trunk/gui/wxpython/vdigit/driver_draw.cpp	2010-03-06 19:12:28 UTC (rev 41313)
@@ -150,6 +150,7 @@
 			isles[j] = NULL;
 		    }
 		    G_free((void *) isles);
+		    isles = NULL;
 		}
 	    }
 	}


Property changes on: grass/trunk/gui/wxpython/vdigit/driver_draw.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: grass/trunk/gui/wxpython/vdigit/line.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/line.cpp	2010-03-06 19:09:09 UTC (rev 41312)
+++ grass/trunk/gui/wxpython/vdigit/line.cpp	2010-03-06 19:12:28 UTC (rev 41313)
@@ -860,6 +860,7 @@
     if (bgMap) {
 	Vect_close(bgMap);
 	G_free ((void *) bgMap);
+	bgMap = NULL;
     }
 
     return ret;



More information about the grass-commit mailing list