Changeset 16742

Timestamp:

11/13/13 15:40:35 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing memory leaks (requested_output needs to be freed)

Location:

issm/trunk-jpl/src/c/cores

Files:

• masstransport_core.cpp (modified) (1 diff)
• steadystate_core.cpp (modified) (1 diff)
• stressbalance_core.cpp (modified) (1 diff)
• thermal_core.cpp (modified) (1 diff)
• transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/masstransport_core.cpp

@@ -84 +84 @@
 
         /*Free ressources:*/
-        if(numoutputs){for(int i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);} 
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 }

issm/trunk-jpl/src/c/cores/steadystate_core.cpp

@@ -87 +87 @@
         delete tg;
         delete ug;      
-        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 }
 bool steadystateconvergence(Vector<IssmDouble>* tg,Vector<IssmDouble>* tg_old,Vector<IssmDouble>* ug,Vector<IssmDouble>* ug_old,IssmDouble reltol){

issm/trunk-jpl/src/c/cores/stressbalance_core.cpp

@@ -94 +94 @@
 
         /*Free ressources:*/    
-        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 }

issm/trunk-jpl/src/c/cores/thermal_core.cpp

@@ -63 +63 @@
                 femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
         }
+
+        /*Free ressources:*/    
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 }

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -179 +179 @@
 
         /*Free ressources:*/    
-        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 }