feedc0de/boost_assert
1
0
Fork 0
forked from boostorg/assert
Code Pull Requests Activity

Use snprintf when available to avoid security warnings (refs #25)

Browse Source
This commit is contained in:
Peter Dimov
2022-06-13 16:02:53 +03:00
parent 78f28be697
commit 601ee4ba7a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/assert/source_location.hpp
View File

@ -73,6 +73,12 @@ public:
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
# pragma warning( push ) # pragma warning( push )
# pragma warning( disable: 4996 ) # pragma warning( disable: 4996 )
#endif
#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) )
# define BOOST_ASSERT_SNPRINTF(buffer, format, arg) std::sprintf(buffer, format, arg)
#else
# define BOOST_ASSERT_SNPRINTF(buffer, format, arg) std::snprintf(buffer, sizeof(buffer)/sizeof(buffer[0]), format, arg)
#endif #endif
std::string to_string() const std::string to_string() const
@ -88,14 +94,14 @@ public:
char buffer[ 16 ]; char buffer[ 16 ];
std::sprintf( buffer, ":%lu", ln ); BOOST_ASSERT_SNPRINTF( buffer, ":%lu", ln );
r += buffer; r += buffer;
unsigned long co = column(); unsigned long co = column();
if( co ) if( co )
{ {
std::sprintf( buffer, ":%lu", co ); BOOST_ASSERT_SNPRINTF( buffer, ":%lu", co );
r += buffer; r += buffer;
} }
@ -111,6 +117,8 @@ public:
return r; return r;
} }
#undef BOOST_ASSERT_SNPRINTF
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
# pragma warning( pop ) # pragma warning( pop )
#endif #endif