From 97439eeb5618c81c605bfa0a9fa03364ae2f2d8e Mon Sep 17 00:00:00 2001
From: degomme <augustin.degomme@unibas.ch>
Date: Sat, 11 Feb 2017 00:27:03 +0100
Subject: [PATCH] fix some potential memory issues with _block MPI datatypes

---
 src/smpi/smpi_pmpi.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp
index 62ca0f186c..f95467f892 100644
--- a/src/smpi/smpi_pmpi.cpp
+++ b/src/smpi/smpi_pmpi.cpp
@@ -2234,7 +2234,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount,
 
   TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
 
-  int* recvcounts=static_cast<int*>(xbt_malloc(count));
+  int* recvcounts=static_cast<int*>(xbt_malloc(count*sizeof(int)));
     for (i=0; i<count;i++)
       recvcounts[i]=recvcount;
     mpi_coll_reduce_scatter_fun(sendbuf, recvbuf, recvcounts, datatype,  op, comm);
@@ -2462,7 +2462,7 @@ int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI
   } else if (count<0){
     retval = MPI_ERR_COUNT;
   } else {
-    int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count));
+    int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count*sizeof(int)));
     for (i=0; i<count;i++)
       blocklens[i]=blocklength;
     retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
@@ -2498,7 +2498,7 @@ int PMPI_Type_create_hindexed_block(int count, int blocklength, MPI_Aint* indice
   } else if (count<0){
     retval = MPI_ERR_COUNT;
   } else {
-    int* blocklens=(int*)xbt_malloc(blocklength*count);
+    int* blocklens=(int*)xbt_malloc(blocklength*count*sizeof(int));
     for (i=0; i<count;i++)blocklens[i]=blocklength;
     retval = smpi_datatype_hindexed(count, blocklens, indices, old_type, new_type);
     xbt_free(blocklens);
-- 
2.20.1