boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-16 22:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for std::locale's which produce collate keys with embedded null's, see https://svn.boost.org/trac/boost/ticket/9451

Browse Source
This commit is contained in:
jzmaddock
2013-12-18 16:54:36 +00:00
parent 937cd366c5
commit 6230db51b1
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/boost/regex/v4/cpp_regex_traits.hpp
View File

@ -21,6 +21,7 @@
#include <boost/config.hpp>
#include <boost/integer.hpp>
#include <boost/type_traits/make_unsigned.hpp>
#ifndef BOOST_NO_STD_LOCALE
@ -582,7 +583,7 @@ typename cpp_regex_traits_implementation<charT>::string_type
// however at least one std lib will always throw
// std::bad_alloc for certain arguments...
//
string_type result;
string_type result, result2;
#ifndef BOOST_NO_EXCEPTIONS
try{
#endif
@ -601,14 +602,36 @@ typename cpp_regex_traits_implementation<charT>::string_type
while(result.size() && (charT(0) == *result.rbegin()))
result.erase(result.size() - 1);
#endif
BOOST_ASSERT(std::find(result.begin(), result.end(), charT(0)) == result.end());
//
// We may have NULL's used as separators between sections of the collate string,
// an example would be Boost.Locale. We have no way to detect this case via
// #defines since this can be used with any compiler/platform combination.
// Unfortunately our state machine (which was devised when all implementations
// used underlying C language API's) can't cope with that case. One workaround
// is to replace each character with 2, fortunately this code isn't used that
// much as this is now slower than before :-(
//
typedef typename make_unsigned<charT>::type uchar_type;
result2.reserve(result.size() * 2 + 2);
for(unsigned i = 0; i < result.size(); ++i)
{
if(static_cast<uchar_type>(result[i]) == (std::numeric_limits<uchar_type>::max)())
{
result2.append(1, charT((std::numeric_limits<uchar_type>::max)())).append(1, charT('b'));
}
else
{
result2.append(1, static_cast<charT>(1 + static_cast<uchar_type>(result[i]))).append(1, charT('b') - 1);
}
}
BOOST_ASSERT(std::find(result2.begin(), result2.end(), charT(0)) == result2.end());
#ifndef BOOST_NO_EXCEPTIONS
}
catch(...)
{
}
#endif
return result;
return result2;
}