feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Fix errno_md POSIX strerror_r loop bugs (Alexander Nasonov)

Browse Source 
[SVN r36446]
This commit is contained in:
Beman Dawes
2006-12-18 12:12:26 +00:00
parent 2cb2125ac9
commit 5688d4a3a2
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/error_code.cpp
View File

@@ -198,21 +198,35 @@ namespace
int result; int result;
for (;;) for (;;)
{ {
if ( (result = strerror_r( ec.value(), bp, sz )) != 0 ) // strerror_r returns 0 on success, otherwise ERANGE if buffer too small,
// EINVAL if ec.value() not a valid error number
if ( (result = strerror_r( ec.value(), bp, sz )) == 0 )
break;
else
{ {
# if defined(__linux) # if defined(__linux)
// Linux strerror_r returns -1 on error, with error number in errno
result = errno; result = errno;
# endif # endif
if ( result != ERANGE ) break; if ( result != ERANGE ) break;
if ( sz > sizeof(buf) ) std::free( bp );
sz *= 2;
if ( (bp = static_cast<char*>(std::malloc( sz ))) == 0 )
return std::string( "ENOMEM" );
} }
if ( sz > sizeof(buf) ) std::free( bp );
sz *= 2;
if ( (bp = static_cast<char*>(std::malloc( sz ))) == 0 )
return std::string( "ENOMEM" );
} }
std::string msg( ( result == EINVAL ) ? "EINVAL" : bp ); try
if ( sz > sizeof(buf) ) std::free( bp ); {
return msg; std::string msg( ( result == EINVAL ) ? "EINVAL" : bp );
if ( sz > sizeof(buf) ) std::free( bp );
sz = 0;
return msg;
}
catch(...)
{
if ( sz > sizeof(buf) ) std::free( bp );
throw;
}
# endif # endif
# endif # endif
} }