Merge pull request #955 from eisenhauer/NewFFSUpstream

New ffs upstream
ornladios · Oct 25, 2018 · 053a094 · 053a094
2 parents 599d95b + 1427261
commit 053a094
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 221 deletions.
diff --git a/source/adios2/toolkit/sst/cp/ffs_marshal.c b/source/adios2/toolkit/sst/cp/ffs_marshal.c
@@ -382,36 +382,39 @@ extern void FFSFreeMarshalData(SstStream Stream)
     {
         /* reader side */
         struct FFSReaderMarshalBase *Info = Stream->ReaderMarshalData;
-        for (int i = 0; i < Stream->WriterCohortSize; i++)
-        {
-            if (Info->WriterInfo[i].RawBuffer)
-                free(Info->WriterInfo[i].RawBuffer);
-        }
-        if (Info->WriterInfo)
-            free(Info->WriterInfo);
-        if (Info->MetadataBaseAddrs)
-            free(Info->MetadataBaseAddrs);
-        if (Info->MetadataFieldLists)
-            free(Info->MetadataFieldLists);
-        if (Info->DataBaseAddrs)
-            free(Info->DataBaseAddrs);
-        if (Info->DataFieldLists)
-            free(Info->DataFieldLists);
-        for (int i = 0; i < Info->VarCount; i++)
+        if (Info)
         {
-            free(Info->VarList[i].VarName);
-            free(Info->VarList[i].PerWriterMetaFieldDesc);
-            free(Info->VarList[i].PerWriterDataFieldDesc);
-            free(Info->VarList[i].PerWriterStart);
-            free(Info->VarList[i].PerWriterCounts);
-            free(Info->VarList[i].PerWriterIncomingData);
-            free(Info->VarList[i].PerWriterIncomingSize);
-        }
-        if (Info->VarList)
-            free(Info->VarList);
+            for (int i = 0; i < Stream->WriterCohortSize; i++)
+            {
+                if (Info->WriterInfo[i].RawBuffer)
+                    free(Info->WriterInfo[i].RawBuffer);
+            }
+            if (Info->WriterInfo)
+                free(Info->WriterInfo);
+            if (Info->MetadataBaseAddrs)
+                free(Info->MetadataBaseAddrs);
+            if (Info->MetadataFieldLists)
+                free(Info->MetadataFieldLists);
+            if (Info->DataBaseAddrs)
+                free(Info->DataBaseAddrs);
+            if (Info->DataFieldLists)
+                free(Info->DataFieldLists);
+            for (int i = 0; i < Info->VarCount; i++)
+            {
+                free(Info->VarList[i].VarName);
+                free(Info->VarList[i].PerWriterMetaFieldDesc);
+                free(Info->VarList[i].PerWriterDataFieldDesc);
+                free(Info->VarList[i].PerWriterStart);
+                free(Info->VarList[i].PerWriterCounts);
+                free(Info->VarList[i].PerWriterIncomingData);
+                free(Info->VarList[i].PerWriterIncomingSize);
+            }
+            if (Info->VarList)
+                free(Info->VarList);
 
-        free(Info);
-        Stream->ReaderMarshalData = NULL;
+            free(Info);
+            Stream->ReaderMarshalData = NULL;
+        }
     }
 }