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

Change POSIX API's so regcomp doesn't check for magic value and read potentially uninitialized memory.

Browse Source 
See https://svn.boost.org/trac/boost/ticket/11472.
This commit is contained in:
jzmaddock
2015-09-25 12:41:02 +01:00
parent 94c7d4a38a
commit d8c95a9950
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/posix_api.cpp
View File

@ -68,23 +68,20 @@ typedef boost::basic_regex<char, c_regex_traits<char> > c_regex_type;
BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char* ptr, int f) BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char* ptr, int f)
{ {
if(expression->re_magic != magic_value)
{
expression->guts = 0;
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
try{ try{
#endif #endif
expression->guts = new c_regex_type(); expression->guts = new c_regex_type();
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
} catch(...) } catch(...)
{ {
return REG_ESPACE; expression->guts = 0;
} return REG_ESPACE;
#else
if(0 == expression->guts)
return REG_E_MEMORY;
#endif
} }
#else
if(0 == expression->guts)
return REG_E_MEMORY;
#endif
// set default flags: // set default flags:
boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? regex::extended : regex::basic); boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? regex::extended : regex::basic);
expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default; expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default;

21
src/wide_posix_api.cpp
View File

@ -78,23 +78,20 @@ typedef boost::basic_regex<wchar_t, c_regex_traits<wchar_t> > wc_regex_type;
BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f) BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
{ {
if(expression->re_magic != wmagic_value)
{
expression->guts = 0;
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
try{ try{
#endif #endif
expression->guts = new wc_regex_type(); expression->guts = new wc_regex_type();
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
} catch(...) } catch(...)
{ {
return REG_ESPACE; expression->guts = 0;
} return REG_ESPACE;
#else
if(0 == expression->guts)
return REG_E_MEMORY;
#endif
} }
#else
if(0 == expression->guts)
return REG_E_MEMORY;
#endif
// set default flags: // set default flags:
boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? wregex::extended : wregex::basic); boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? wregex::extended : wregex::basic);
expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default; expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default;