Changeset 18890

Timestamp:

11/28/14 10:42:56 (10 years ago)

Author:

Eric.Larour

Message:

CHG: avoid leaks when using new constructor in control ad core.

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -90 +90 @@
 
         bool traceon=true;
+        this->profiler=NULL; /*avoid leak, as we are not using the profiler ever in ad control run. */
         
         /*Store the communicator, but do not set it as a global variable, as this has already 
@@ -112 +113 @@
 
         /*Delete all the datasets: */
-        xDelete<int>(analysis_type_list);
-        xDelete<char>(outbinfilename);
-        xDelete<char>(lockfilename);
-        delete elements;
-        delete nodes;
-        delete vertices;
-        delete constraints;
-        delete loads;
-        delete materials;
-        delete parameters;
-        delete results;
+        if(analysis_type_list)xDelete<int>(analysis_type_list);
+        if(outbinfilename)xDelete<char>(outbinfilename);
+        if(lockfilename)xDelete<char>(lockfilename);
+        if(elements)delete elements;
+        if(nodes)delete nodes;
+        if(vertices)delete vertices;
+        if(constraints)delete constraints;
+        if(loads)delete loads;
+        if(materials)delete materials;
+        if(parameters)delete parameters;
+        if(results)delete results;
 
         /*Now delete: */
-        delete profiler;
-
+        if(profiler)delete profiler;
 }
 /*}}}*/