github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check for (and throw on) large min repeat

Browse Source 
We were only checking for large maximum bounds, which meant that we
would attempt to compile A{N,} where N is huge.
This commit is contained in:
Justin Viiret 2015-10-29 09:08:40 +11:00 committed by Matthew Barr
parent b77613802d
commit 1afc591c30
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/parser/ComponentRepeat.cpp
View File

@ -51,11 +51,11 @@ using namespace std;
namespace ue2 { namespace ue2 {
/** \brief Hard limit on the maximum repeat for bounded repeats. */ /** \brief Hard limit on the maximum repeat for bounded repeats. */
static const u32 MAX_MAX_BOUND = 32767; static constexpr u32 MAX_REPEAT = 32767;
/** \brief If expanding a repeat would lead to this many positions being /** \brief If expanding a repeat would lead to this many positions being
* generated, we fail the pattern. */ * generated, we fail the pattern. */
static const u32 MAX_POSITIONS_EXPANDED = 500000; // arbitrarily huge static constexpr u32 MAX_POSITIONS_EXPANDED = 500000; // arbitrarily huge
/* no edge priorities means that if our subcomponent can be empty, our min /* no edge priorities means that if our subcomponent can be empty, our min
* extent is effectively zero. */ * extent is effectively zero. */
@ -67,7 +67,11 @@ ComponentRepeat::ComponentRepeat(unique_ptr<Component> sub_comp_in, u32 min,
assert(sub_comp); assert(sub_comp);
assert(max > 0); assert(max > 0);
assert(m_min <= m_max); assert(m_min <= m_max);
if (m_max < NoLimit && m_max > MAX_MAX_BOUND) {
if (m_min > MAX_REPEAT) {
throw ParseError("Bounded repeat is too large.");
}
if (m_max != NoLimit && m_max > MAX_REPEAT) {
throw ParseError("Bounded repeat is too large."); throw ParseError("Bounded repeat is too large.");
} }
} }
@ -119,7 +123,7 @@ void checkPositions(vector<PositionInfo> &v, const GlushkovBuildState &bs) {
void ComponentRepeat::notePositions(GlushkovBuildState &bs) { void ComponentRepeat::notePositions(GlushkovBuildState &bs) {
assert(m_max > 0); assert(m_max > 0);
assert(m_max == NoLimit || m_max < MAX_MAX_BOUND); assert(m_max == NoLimit || m_max < MAX_REPEAT);
/* Note: We can construct smaller subgraphs if we're not maintaining edge /* Note: We can construct smaller subgraphs if we're not maintaining edge
* priorities. */ * priorities. */

1
unit/hyperscan/bad_patterns.txt
View File

@ -127,3 +127,4 @@
127:/^fo?ob{ro|nax_off\Qt=10omnax+8Wnah/ñññññññññññññññññññññññññññ0}l.{1,60}Car*k|npanomnax+8Wnah/8 #Expression is not valid UTF-8. 127:/^fo?ob{ro|nax_off\Qt=10omnax+8Wnah/ñññññññññññññññññññññññññññ0}l.{1,60}Car*k|npanomnax+8Wnah/8 #Expression is not valid UTF-8.
128:/(*UTF8)^fo?ob{ro|nax_off\Qt=10omnax+8Wnah/ñññññññññññññññññññññññññññ0}l.{1,60}Car*k|npanomnax+8Wnah/ #Expression is not valid UTF-8. 128:/(*UTF8)^fo?ob{ro|nax_off\Qt=10omnax+8Wnah/ñññññññññññññññññññññññññññ0}l.{1,60}Car*k|npanomnax+8Wnah/ #Expression is not valid UTF-8.
129:/bignum \1111111111111111111/ #Number is too big at index 7. 129:/bignum \1111111111111111111/ #Number is too big at index 7.
130:/foo|&{5555555,}/ #Bounded repeat is too large.