feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Apply changes from https://github.com/boostorg/regex/pull/16

Browse Source
This commit is contained in:
John Maddock
2018-07-18 18:30:14 +01:00
parent 35fbb2e5e2
commit ac49efa23f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/regex/v4/regex_workaround.hpp
View File

@ -198,9 +198,10 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
const char *strSource const char *strSource
) )
{ {
if(std::strlen(strSource)+1 > sizeInBytes) std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
if (lenSourceWithNull > sizeInBytes)
return 1; return 1;
std::strcpy(strDestination, strSource); std::memcpy(strDestination, strSource, lenSourceWithNull);
return 0; return 0;
} }
inline std::size_t strcat_s( inline std::size_t strcat_s(
@ -209,9 +210,11 @@ namespace boost{ namespace BOOST_REGEX_DETAIL_NS{
const char *strSource const char *strSource
) )
{ {
if(std::strlen(strSource) + std::strlen(strDestination) + 1 > sizeInBytes) std::size_t lenSourceWithNull = std::strlen(strSource) + 1;
std::size_t lenDestination = std::strlen(strDestination);
if (lenSourceWithNull + lenDestination > sizeInBytes)
return 1; return 1;
std::strcat(strDestination, strSource); std::memcpy(strDestination + lenDestination, strSource, lenSourceWithNull);
return 0; return 0;
} }