Changeset 16501

Timestamp:

10/22/13 08:36:41 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing memory leaks

File:

• issm/trunk-jpl/src/c/classes/IoModel.cpp (modified) (6 diffs)

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

@@ -1081 +1081 @@
 void  IoModel::FetchMultipleData(char*** pstrings,int* pnumstrings,int data_enum){
 
-        int my_rank;
-
-        int i;
-        int num_instances;
-        int* codes=NULL;
+        int  num_instances;
 
         /*output: */
@@ -1094 +1090 @@
         char   *string         = NULL;
         int     string_size;
+        int    *codes          = NULL;
         int    *code           = NULL;
         fpos_t *file_positions = NULL;
 
         /*recover my_rank:*/
-        my_rank=IssmComm::GetRank();
+        int my_rank=IssmComm::GetRank();
 
         /*Get file pointers to beginning of the data (multiple instances of it): */
@@ -1106 +1103 @@
                 strings=xNew<char*>(num_instances);
 
-                for(i=0;i<num_instances;i++){
+                for(int i=0;i<num_instances;i++){
 
                         if(my_rank==0){
@@ -1139 +1136 @@
         /*Free ressources:*/
         xDelete<int>(codes);
+        xDelete<fpos_t>(file_positions);
         
         /*Assign output pointers: */
@@ -1148 +1146 @@
 void  IoModel::FetchMultipleData(IssmDouble*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum){
 
-        int i;
-        int num_instances;
+        int     num_instances;
         fpos_t* file_positions=NULL;
 
@@ -1231 +1228 @@
                         
         /*Free ressources:*/
+        xDelete<fpos_t>(file_positions);
         xDelete<int>(codes);