Merge pull request #3060 from alex-mikheev/topic/mpi_unpack_fix_v2.x

hppritcha · web-flow · commit 8d2c64320b31 · 2017-03-01T04:41:23.000-08:00
v2.x: ompi: fixes crash in mpi_unpack
diff --git a/ompi/mpi/c/unpack.c b/ompi/mpi/c/unpack.c
@@ -105,6 +105,5 @@ int MPI_Unpack(const void *inbuf, int insize, int *position,
         rc = (1 == rc) ? OMPI_SUCCESS : OMPI_ERROR;
     }
 
-    OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,
-                           comm, MPI_ERR_UNKNOWN, FUNC_NAME);
+    OMPI_ERRHANDLER_RETURN(rc, comm, MPI_ERR_UNKNOWN, FUNC_NAME);
 }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,5 @@ int MPI_Unpack(const void inbuf, int insize, int position,`
`105`	`105`	`rc = (1 == rc) ? OMPI_SUCCESS : OMPI_ERROR;`
`106`	`106`	`}`
`107`	`107`
`108`		`- OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,`
`109`		`- comm, MPI_ERR_UNKNOWN, FUNC_NAME);`
	`108`	`+ OMPI_ERRHANDLER_RETURN(rc, comm, MPI_ERR_UNKNOWN, FUNC_NAME);`
`110`	`109`	`}`