Fix possible memory leak in ompi_dpm_dyn_finalize

David Wootton · David Wootton · commit 2359a0575236 · 2022-10-26T16:56:26.000-04:00
Signed-off-by: David Wootton &lt;dwootton@us.ibm.com&gt;
diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c
@@ -1779,6 +1779,7 @@ int ompi_dpm_dyn_finalize(void)
         }
 
         disconnect_waitall(ompi_comm_num_dyncomm, objs);
+        cleanup_dpm_disconnect_objs(objs, ompi_comm_num_dyncomm);
     }
 
     return OMPI_SUCCESS;
@@ -1896,8 +1897,6 @@ static int disconnect_waitall (int count, ompi_dpm_disconnect_obj **objs)
     /* force all non-blocking all-to-alls to finish */
     ret = ompi_request_wait_all(2*totalcount, reqs, MPI_STATUSES_IGNORE);
 
-    /* Finally, free everything */
-    cleanup_dpm_disconnect_objs(objs, count);
     free(reqs);
 
     return ret;

Original file line number	Diff line number	Diff line change
`@@ -1779,6 +1779,7 @@ int ompi_dpm_dyn_finalize(void)`
`1779`	`1779`	`}`
`1780`	`1780`
`1781`	`1781`	`disconnect_waitall(ompi_comm_num_dyncomm, objs);`
	`1782`	`+ cleanup_dpm_disconnect_objs(objs, ompi_comm_num_dyncomm);`
`1782`	`1783`	`}`
`1783`	`1784`
`1784`	`1785`	`return OMPI_SUCCESS;`
`@@ -1896,8 +1897,6 @@ static int disconnect_waitall (int count, ompi_dpm_disconnect_obj **objs)`
`1896`	`1897`	`/* force all non-blocking all-to-alls to finish */`
`1897`	`1898`	`ret = ompi_request_wait_all(2*totalcount, reqs, MPI_STATUSES_IGNORE);`
`1898`	`1899`
`1899`		`- /* Finally, free everything */`
`1900`		`- cleanup_dpm_disconnect_objs(objs, count);`
`1901`	`1900`	`free(reqs);`
`1902`	`1901`
`1903`	`1902`	`return ret;`