Merge pull request open-mpi#789 from ggouaillardet/topic/v2.x/topo_base_dist_graph_create_adjacent

jsquyres · jsquyres · commit 302a515107ce · 2015-12-01T09:25:59.000-05:00
topo/base: correctly free the topo object in mca_topo_base_dist_graph…
diff --git a/ompi/mca/topo/base/topo_base_dist_graph_create_adjacent.c b/ompi/mca/topo/base/topo_base_dist_graph_create_adjacent.c
@@ -101,7 +101,7 @@ int mca_topo_base_dist_graph_create_adjacent(mca_topo_base_module_t* module,
         if( MPI_UNWEIGHTED != destweights ) {
             if( NULL != topo->outw ) free(topo->outw);
         }
-        free(topo);
+        OBJ_RELEASE(topo);
     }
     ompi_comm_free(newcomm);
     return err;

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ int mca_topo_base_dist_graph_create_adjacent(mca_topo_base_module_t* module,`
`101`	`101`	`if( MPI_UNWEIGHTED != destweights ) {`
`102`	`102`	`if( NULL != topo->outw ) free(topo->outw);`
`103`	`103`	`}`
`104`		`- free(topo);`
	`104`	`+ OBJ_RELEASE(topo);`
`105`	`105`	`}`
`106`	`106`	`ompi_comm_free(newcomm);`
`107`	`107`	`return err;`