From 3a9664ac9d473142cc8ae6fcde157c96129cea20 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Sun, 6 Dec 2015 14:06:36 -0500 Subject: [PATCH] Fix Coverity CIDs 1341584-1341589. --- ompi/mca/coll/base/coll_base_allgather.c | 2 +- ompi/mca/coll/base/coll_base_alltoall.c | 2 +- ompi/mca/coll/base/coll_base_gather.c | 4 ++-- ompi/mca/coll/base/coll_base_scatter.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ompi/mca/coll/base/coll_base_allgather.c b/ompi/mca/coll/base/coll_base_allgather.c index a0fcff8272..460a7861e5 100644 --- a/ompi/mca/coll/base/coll_base_allgather.c +++ b/ompi/mca/coll/base/coll_base_allgather.c @@ -170,7 +170,7 @@ int ompi_coll_base_allgather_intra_bruck(const void *sbuf, int scount, char *free_buf = NULL, *shift_buf = NULL; ptrdiff_t span, gap; - span = opal_datatype_span(&rdtype->super, (size - rank) * rcount, &gap); + span = opal_datatype_span(&rdtype->super, (int64_t)(size - rank) * rcount, &gap); free_buf = (char*)calloc(span, sizeof(char)); if (NULL == free_buf) { diff --git a/ompi/mca/coll/base/coll_base_alltoall.c b/ompi/mca/coll/base/coll_base_alltoall.c index 48c13afb59..289296b5b3 100644 --- a/ompi/mca/coll/base/coll_base_alltoall.c +++ b/ompi/mca/coll/base/coll_base_alltoall.c @@ -219,7 +219,7 @@ int ompi_coll_base_alltoall_intra_bruck(const void *sbuf, int scount, err = ompi_datatype_type_extent (rdtype, &rext); if (err != MPI_SUCCESS) { line = __LINE__; goto err_hndl; } - span = opal_datatype_span(&sdtype->super, size * scount, &gap); + span = opal_datatype_span(&sdtype->super, (int64_t)size * scount, &gap); displs = (int *) malloc(size * sizeof(int)); if (displs == NULL) { line = __LINE__; err = -1; goto err_hndl; } diff --git a/ompi/mca/coll/base/coll_base_gather.c b/ompi/mca/coll/base/coll_base_gather.c index 80f7b70156..df14cee120 100644 --- a/ompi/mca/coll/base/coll_base_gather.c +++ b/ompi/mca/coll/base/coll_base_gather.c @@ -66,8 +66,8 @@ ompi_coll_base_gather_intra_binomial(const void *sbuf, int scount, ompi_datatype_type_extent(sdtype, &sextent); ompi_datatype_type_extent(rdtype, &rextent); - ssize = opal_datatype_span(&sdtype->super, scount * size, &sgap); - rsize = opal_datatype_span(&rdtype->super, rcount * size, &rgap); + ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap); + rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap); vrank = (rank - root + size) % size; diff --git a/ompi/mca/coll/base/coll_base_scatter.c b/ompi/mca/coll/base/coll_base_scatter.c index 71605595e1..21a4d8c9fa 100644 --- a/ompi/mca/coll/base/coll_base_scatter.c +++ b/ompi/mca/coll/base/coll_base_scatter.c @@ -65,8 +65,8 @@ ompi_coll_base_scatter_intra_binomial( const void *sbuf, int scount, ompi_datatype_type_extent(sdtype, &sextent); ompi_datatype_type_extent(rdtype, &rextent); - ssize = opal_datatype_span(&sdtype->super, scount * size, &sgap); - rsize = opal_datatype_span(&rdtype->super, rcount * size, &rgap); + ssize = opal_datatype_span(&sdtype->super, (int64_t)scount * size, &sgap); + rsize = opal_datatype_span(&rdtype->super, (int64_t)rcount * size, &rgap); vrank = (rank - root + size) % size; ptmp = (char *) rbuf; /* by default suppose leaf nodes, just use rbuf */