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

Tweeked number of states that cause a throw to occur during search.

Browse Source 
[SVN r15402]
This commit is contained in:
John Maddock
2002-09-17 10:57:26 +00:00
parent eeae9a0762
commit 6ee955be5f
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/regex/detail/regex_match.hpp
View File

@ -214,12 +214,12 @@ public:
void estimate_max_state_count(iterator a, iterator b, unsigned states, std::random_access_iterator_tag*) void estimate_max_state_count(iterator a, iterator b, unsigned states, std::random_access_iterator_tag*)
{ {
difference_type dist = std::distance(a,b); difference_type dist = std::distance(a,b);
if(dist > (std::numeric_limits<difference_type>::max() / (states * 3))) states *= states;
max_state_count = std::numeric_limits<difference_type>::max(); difference_type lim = std::numeric_limits<difference_type>::max() - 1000 - states;
if(dist > (difference_type)(lim / states))
max_state_count = lim;
else else
max_state_count = states * 3 * dist; max_state_count = 1000 + states * dist;
if(max_state_count < 1000)
max_state_count = 1000;
} }
void estimate_max_state_count(iterator a, iterator b, unsigned states, void*) void estimate_max_state_count(iterator a, iterator b, unsigned states, void*)
{ {
@ -964,7 +964,19 @@ bool query_match_aux(iterator first,
// //
if(state_count >= pd.max_state_count) if(state_count >= pd.max_state_count)
{ {
#ifndef BOOST_NO_EXCEPTIONS
throw std::runtime_error("Max regex search depth exceeded."); throw std::runtime_error("Max regex search depth exceeded.");
#else
while(matches.empty() == false)
matches.pop();
while(prev_pos.empty() == false)
prev_pos.pop();
while(prev_record.empty() == false)
prev_record.pop();
while(prev_acc.empty() == false)
prev_acc.pop();
return false;
#endif
} }
// //
@ -1075,7 +1087,10 @@ bool query_match_aux(iterator first,
} }
if(match_found || have_partial_match) if(match_found || have_partial_match)
{
return true; return true;
pd.state_count = 0;
}
// if we get to here then everything has failed // if we get to here then everything has failed
// and no match was found: // and no match was found: