Merge pull request #762 from nysal/topic/mrecv

rhc54 · rhc54 · commit 21dde0bd6e45 · 2015-07-30T10:43:38.000-07:00
Fix an invalid memory access in mrecv &amp; imrecv
diff --git a/ompi/mpi/c/imrecv.c b/ompi/mpi/c/imrecv.c
@@ -67,5 +67,5 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype type,
     OPAL_CR_ENTER_LIBRARY();
 
     rc = MCA_PML_CALL(imrecv(buf, count, type, message, request));
-    OMPI_ERRHANDLER_RETURN(rc, (*message)->comm, rc, FUNC_NAME);
+    OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
 }
diff --git a/ompi/mpi/c/mrecv.c b/ompi/mpi/c/mrecv.c
@@ -75,5 +75,5 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype type,
         opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int));
     );
 
-    OMPI_ERRHANDLER_RETURN(rc, (*message)->comm, rc, FUNC_NAME);
+    OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
 }

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype type,`
`67`	`67`	`OPAL_CR_ENTER_LIBRARY();`
`68`	`68`
`69`	`69`	`rc = MCA_PML_CALL(imrecv(buf, count, type, message, request));`
`70`		`- OMPI_ERRHANDLER_RETURN(rc, (*message)->comm, rc, FUNC_NAME);`
	`70`	`+ OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,5 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype type,`
`75`	`75`	`opal_memchecker_base_mem_undefined(&status->MPI_ERROR, sizeof(int));`
`76`	`76`	`);`
`77`	`77`
`78`		`- OMPI_ERRHANDLER_RETURN(rc, (*message)->comm, rc, FUNC_NAME);`
	`78`	`+ OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);`
`79`	`79`	`}`