From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 19 Jan 2016 00:09:06 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~1211
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/894f85d7fcd5c066d50d00754bee00b6f78d82a0?hp=bb80e6681b64c92d94bd443ad1833c556f1d69e6

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index ac0bdb4e71..45ab1928df 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -210,7 +210,7 @@ void SD_workstation_dump(SD_workstation_t ws)
  *
  * \param src a workstation
  * \param dst another workstation
- * \return a new array of \ref SD_link_t representating the route between these two workstations
+ * \return a new array of \ref SD_link_t representing the route between these two workstations
  * \see SD_route_get_size(), SD_link_t
  */
 const SD_link_t *SD_route_get_list(SD_workstation_t src,
diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c
index e543313e40..ef4cc43573 100644
--- a/src/smpi/smpi_replay.c
+++ b/src/smpi/smpi_replay.c
@@ -75,7 +75,7 @@ void* smpi_get_tmp_recvbuffer(int size){
     recvbuffer=xbt_realloc(recvbuffer,size);
     recvbuffer_size=size;
   }
-  return sendbuffer;
+  return recvbuffer;
 }
 
 void smpi_free_tmp_buffer(void* buf){
@@ -689,7 +689,7 @@ static void action_gather(const char *const *action) {
   int send_size = parse_double(action[2]);
   int recv_size = parse_double(action[3]);
   MPI_Datatype MPI_CURRENT_TYPE2;
-  if(action[5]) {
+  if(action[4] && action[5]) {
     MPI_CURRENT_TYPE=decode_datatype(action[5]);
     MPI_CURRENT_TYPE2=decode_datatype(action[6]);
   } else {