wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 616491 - Follow-up: detect over-recursion on Windows. r=mjrosenb

Browse Source
This commit is contained in:
Sean Stangl 2014-04-08 13:51:37 -07:00
parent 568ece4f0e
commit d6f3e0ec87
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/src/yarr/YarrPattern.cpp
View File

@ -304,6 +304,22 @@ public:
m_pattern.m_disjunctions.append(m_pattern.m_body);
}
void setStackBase(uint8_t *stackBase) {
m_stackBase = stackBase;
}
bool isOverRecursed() {
/*
* Bug 616491: attempt detection of over-recursion.
* "256KB should be enough stack for anyone."
*/
uint8_t stackDummy_;
JS_ASSERT(m_stackBase != nullptr);
if (m_stackBase - &stackDummy_ > (1 << 18))
return true;
return false;
}
void assertionBOL()
{
if (!m_alternative->m_terms.size() & !m_invertParentheticalAssertion) {
@ -574,12 +590,7 @@ public:
ErrorCode setupAlternativeOffsets(PatternAlternative* alternative, unsigned currentCallFrameSize, unsigned initialInputPosition,
unsigned *callFrameSizeOut)
{
/*
* Attempt detection of over-recursion:
* "1MB should be enough stack for anyone."
*/
uint8_t stackDummy_;
if (m_stackBase - &stackDummy_ > 1024*1024)
if (isOverRecursed())
return PatternTooLarge;
alternative->m_hasFixedSize = true;
@ -674,6 +685,9 @@ public:
ErrorCode setupDisjunctionOffsets(PatternDisjunction* disjunction, unsigned initialCallFrameSize, unsigned initialInputPosition, unsigned *maximumCallFrameSizeOut)
{
if (isOverRecursed())
return PatternTooLarge;
if ((disjunction != m_pattern.m_body) && (disjunction->m_alternatives.size() > 1))
initialCallFrameSize += YarrStackSpaceForBackTrackInfoAlternative;
@ -850,10 +864,6 @@ public:
}
}
void setStackBase(uint8_t *stackBase) {
m_stackBase = stackBase;
}
private:
YarrPattern& m_pattern;
uint8_t * m_stackBase;
@ -867,6 +877,9 @@ ErrorCode YarrPattern::compile(const String& patternString)
{
YarrPatternConstructor constructor(*this);
uint8_t stackDummy_;
constructor.setStackBase(&stackDummy_);
if (ErrorCode error = parse(constructor, patternString))
return error;
@ -887,9 +900,6 @@ ErrorCode YarrPattern::compile(const String& patternString)
ASSERT(numSubpatterns == m_numSubpatterns);
}
uint8_t stackDummy_;
constructor.setStackBase(&stackDummy_);
constructor.checkForTerminalParentheses();
constructor.optimizeDotStarWrappedExpressions();
constructor.optimizeBOL();