From ac3a01c39cecdfdc24590644eb2bf44eae68fc68 Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Thu, 3 Sep 2015 09:10:25 -0500 Subject: [PATCH] Silence coverty warnings 1321702, 1321701, 1321700, 72331, 72330, 72327, 72326, 72325, --- ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c | 12 ++++-------- .../mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c | 6 ++++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c index 0556e8e766..edfe2f0526 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_read_all.c @@ -730,13 +730,6 @@ mca_fcoll_dynamic_file_read_all (mca_io_ompio_file_t *fh, temp_disp_index = NULL; } - send_req = (MPI_Request *) - malloc (fh->f_procs_per_group * sizeof(MPI_Request)); - if (NULL == send_req){ - opal_output ( 1, "OUT OF MEMORY\n"); - ret = OMPI_ERR_OUT_OF_RESOURCE; - goto exit; - } #if OMPIO_FCOLL_WANT_TIME_BREAKDOWN start_rcomm_time = MPI_Wtime(); #endif @@ -965,7 +958,10 @@ exit: free(displs_per_process); displs_per_process = NULL; } - + if ( NULL != send_req ) { + free ( send_req ); + send_req = NULL; + } } return ret; } diff --git a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c index 13949cb0b2..1490c10c8b 100644 --- a/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c +++ b/ompi/mca/fcoll/dynamic/fcoll_dynamic_file_write_all.c @@ -713,7 +713,8 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh, temp_disp_index = (int *)calloc (1, fh->f_procs_per_group * sizeof (int)); if (NULL == temp_disp_index) { opal_output (1, "OUT OF MEMORY\n"); - return OMPI_ERR_OUT_OF_RESOURCE; + ret = OMPI_ERR_OUT_OF_RESOURCE; + goto exit; } /*Now update the displacements array with memory offsets*/ @@ -815,7 +816,8 @@ mca_fcoll_dynamic_file_write_all (mca_io_ompio_file_t *fh, send_buf = malloc (bytes_sent); if (NULL == send_buf) { opal_output (1, "OUT OF MEMORY\n"); - return OMPI_ERR_OUT_OF_RESOURCE; + ret = OMPI_ERR_OUT_OF_RESOURCE; + goto exit; } remaining = bytes_sent;