From 38d63aaf7c6106f820cad79334e0f9c0b17b509e Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 2 Jun 2024 23:03:24 +0300 Subject: [PATCH] strerror_r(ev, tmp, 0) may return tmp --- .../system/detail/generic_category_message.hpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/boost/system/detail/generic_category_message.hpp b/include/boost/system/detail/generic_category_message.hpp index 3b75ade..d2f2e41 100644 --- a/include/boost/system/detail/generic_category_message.hpp +++ b/include/boost/system/detail/generic_category_message.hpp @@ -39,12 +39,19 @@ inline char const * strerror_r_helper( int r, char const * buffer ) noexcept inline char const * generic_error_category_message( int ev, char * buffer, std::size_t len ) noexcept { - if ( buffer != nullptr ) + if( buffer != nullptr ) + { return strerror_r_helper( strerror_r( ev, buffer, len ), buffer ); + } + else + { + // strerror_r requires non-null buffer pointer - // strerror_r requires non-null buffer pointer - char dummy_buffer[ 1 ]; - return strerror_r_helper( strerror_r( ev, dummy_buffer, 0 ), buffer ); + char tmp[ 1 ]; + char const* r = strerror_r_helper( strerror_r( ev, tmp, 0 ), buffer ); + + return r == tmp? nullptr: r; + } } inline std::string generic_error_category_message( int ev )