From 1509a50e35dbcad0fe6c99e059fb5b2aba1143f2 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 14 May 2019 15:23:18 +0200 Subject: [PATCH 1/1] Fix PMPI_Error_string. MPI_MAX_ERROR_STRING was wrongly used for higher error code. Use snprintf and ensure the string is properly null terminated. --- src/smpi/bindings/smpi_pmpi.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index a20a5ff5b1..933894a518 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -214,17 +214,16 @@ int PMPI_Error_class(int errorcode, int* errorclass) { return MPI_SUCCESS; } -int PMPI_Error_string(int errorcode, char* string, int* resultlen){ - if (errorcode<0 || errorcode>= MPI_MAX_ERROR_STRING || string ==nullptr){ +int PMPI_Error_string(int errorcode, char* string, int* resultlen) +{ + static const char* smpi_error_string[] = {FOREACH_ERROR(GENERATE_STRING)}; + constexpr int nerrors = (sizeof smpi_error_string) / (sizeof smpi_error_string[0]); + if (errorcode < 0 || errorcode >= nerrors || string == nullptr) return MPI_ERR_ARG; - } else { - static const char *smpi_error_string[] = { - FOREACH_ERROR(GENERATE_STRING) - }; - *resultlen = strlen(smpi_error_string[errorcode]); - memcpy(string, smpi_error_string[errorcode], *resultlen*sizeof(char)); - return MPI_SUCCESS; - } + + int len = snprintf(string, MPI_MAX_ERROR_STRING, "%s", smpi_error_string[errorcode]); + *resultlen = std::min(len, MPI_MAX_ERROR_STRING - 1); + return MPI_SUCCESS; } int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) { -- 2.20.1