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

Fixed problems that occur when regex has invalid or unititalised expression.

Browse Source 
[SVN r10231]
This commit is contained in:
John Maddock
2001-05-26 11:57:25 +00:00
parent bfb3ccc907
commit 0ef48255a7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/regex.hpp
View File

@ -604,20 +604,25 @@ public:
// //
// str: // str:
std::basic_string<charT> BOOST_RE_CALL str()const std::basic_string<charT> BOOST_RE_CALL str()const
{ return std::basic_string<charT>(_expression, _expression_len); } {
std::basic_string<charT> result;
if(this->error_code() == 0)
result = std::basic_string<charT>(_expression, _expression_len);
return result;
}
// //
// begin, end: // begin, end:
const_iterator BOOST_RE_CALL begin()const const_iterator BOOST_RE_CALL begin()const
{ return _expression; } { return (this->error_code() ? 0 : _expression); }
const_iterator BOOST_RE_CALL end()const const_iterator BOOST_RE_CALL end()const
{ return _expression + _expression_len; } { return (this->error_code() ? 0 : _expression + _expression_len); }
// //
// swap: // swap:
void BOOST_RE_CALL swap(reg_expression&)throw(); void BOOST_RE_CALL swap(reg_expression&)throw();
// //
// size: // size:
size_type BOOST_RE_CALL size()const size_type BOOST_RE_CALL size()const
{ return _expression_len; } { return (this->error_code() ? 0 : _expression_len); }
// //
// max_size: // max_size:
size_type BOOST_RE_CALL max_size()const size_type BOOST_RE_CALL max_size()const
@ -627,14 +632,14 @@ public:
bool BOOST_RE_CALL empty()const bool BOOST_RE_CALL empty()const
{ return this->error_code(); } { return this->error_code(); }
unsigned BOOST_RE_CALL mark_count()const { return marks; } unsigned BOOST_RE_CALL mark_count()const { return (this->error_code() ? 0 : marks); }
bool BOOST_RE_CALL operator==(const reg_expression&)const; bool BOOST_RE_CALL operator==(const reg_expression&)const;
bool BOOST_RE_CALL operator<(const reg_expression&)const; bool BOOST_RE_CALL operator<(const reg_expression&)const;
// //
// The following are deprecated as public interfaces // The following are deprecated as public interfaces
// but are available for compatability with earlier versions. // but are available for compatability with earlier versions.
allocator_type BOOST_RE_CALL allocator()const; allocator_type BOOST_RE_CALL allocator()const;
const charT* BOOST_RE_CALL expression()const { return _expression; } const charT* BOOST_RE_CALL expression()const { return (this->error_code() ? 0 : _expression); }
unsigned int BOOST_RE_CALL set_expression(const charT* p, const charT* end, flag_type f = regbase::normal); unsigned int BOOST_RE_CALL set_expression(const charT* p, const charT* end, flag_type f = regbase::normal);
unsigned int BOOST_RE_CALL set_expression(const charT* p, flag_type f = regbase::normal) { return set_expression(p, p + traits_type::length(p), f); } unsigned int BOOST_RE_CALL set_expression(const charT* p, flag_type f = regbase::normal) { return set_expression(p, p + traits_type::length(p), f); }
// //