ompio: plug misc memory leaks

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

ompi/mca/common/ompio/common_ompio_file_open.c

@@ -10,7 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2008-2017 University of Houston. All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -307,6 +307,10 @@ int mca_common_ompio_file_close (mca_io_ompio_file_t *ompio_fh)
         ompio_fh->f_io_array = NULL;
     }
 
+    if (NULL != ompio_fh->f_init_aggr_list) {
+        free (ompio_fh->f_init_aggr_list);
+        ompio_fh->f_init_aggr_list = NULL;
+    }
     if (NULL != ompio_fh->f_init_procs_in_group) {
         free (ompio_fh->f_init_procs_in_group);
         ompio_fh->f_init_procs_in_group = NULL;
@@ -358,7 +362,7 @@ int mca_common_ompio_file_close (mca_io_ompio_file_t *ompio_fh)
     }
 
 
-    if (MPI_COMM_NULL != ompio_fh->f_comm && (ompio_fh->f_flags & OMPIO_SHAREDFP_IS_SET) )  {
+    if (MPI_COMM_NULL != ompio_fh->f_comm)  {
         ompi_comm_free (&ompio_fh->f_comm);
     }
 

ompi/mca/io/ompio/io_ompio_aggregators.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2008-2016 University of Houston. All rights reserved.
  * Copyright (c) 2011-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
- * Copyright (c) 2015-2016 Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -315,6 +315,9 @@ int mca_io_ompio_finalize_initial_grouping(mca_io_ompio_file_t *fh,
     int y = 0;
 
     fh->f_init_num_aggrs = num_groups;
+    if (NULL != fh->f_init_aggr_list) {
+        free(fh->f_init_aggr_list);
+    }
     fh->f_init_aggr_list = (int*)malloc (fh->f_init_num_aggrs * sizeof(int));
     if (NULL == fh->f_init_aggr_list) {
         opal_output (1, "OUT OF MEMORY\n");
@@ -325,6 +328,9 @@ int mca_io_ompio_finalize_initial_grouping(mca_io_ompio_file_t *fh,
         for( y = 0; y < contg_groups[z].procs_per_contg_group; y++){
             if ( fh->f_rank == contg_groups[z].procs_in_contg_group[y] ) {
                 fh->f_init_procs_per_group = contg_groups[z].procs_per_contg_group;
+                if (NULL != fh->f_init_procs_in_group) {
+                    free(fh->f_init_procs_in_group);
+                }
                 fh->f_init_procs_in_group = (int*)malloc (fh->f_init_procs_per_group * sizeof(int));
                 if (NULL == fh->f_init_procs_in_group) {
                     opal_output (1, "OUT OF MEMORY\n");