From 692e4c57e83607f21d0c1b1b735585b3b63564f3 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 21 Aug 2017 12:33:29 +0200 Subject: Check recursion depth in assembly parser. --- libsolidity/parsing/ParserBase.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'libsolidity/parsing/ParserBase.cpp') diff --git a/libsolidity/parsing/ParserBase.cpp b/libsolidity/parsing/ParserBase.cpp index 5657c2c0..db988739 100644 --- a/libsolidity/parsing/ParserBase.cpp +++ b/libsolidity/parsing/ParserBase.cpp @@ -101,6 +101,19 @@ void ParserBase::expectToken(Token::Value _value) m_scanner->next(); } +void ParserBase::increaseRecursionDepth() +{ + m_recursionDepth++; + if (m_recursionDepth >= 4096) + fatalParserError("Maximum recursion depth reached during parsing."); +} + +void ParserBase::decreaseRecursionDepth() +{ + solAssert(m_recursionDepth > 0, ""); + m_recursionDepth--; +} + void ParserBase::parserError(string const& _description) { m_errorReporter.parserError(SourceLocation(position(), position(), sourceName()), _description); -- cgit v1.2.3 From 628b54ce351dd5de8ec34aa8c2c23f2fd0a77d90 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 22 Aug 2017 12:32:15 +0200 Subject: Reduce max recursion depth. --- libsolidity/parsing/ParserBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libsolidity/parsing/ParserBase.cpp') diff --git a/libsolidity/parsing/ParserBase.cpp b/libsolidity/parsing/ParserBase.cpp index db988739..fe95b0fe 100644 --- a/libsolidity/parsing/ParserBase.cpp +++ b/libsolidity/parsing/ParserBase.cpp @@ -104,7 +104,7 @@ void ParserBase::expectToken(Token::Value _value) void ParserBase::increaseRecursionDepth() { m_recursionDepth++; - if (m_recursionDepth >= 4096) + if (m_recursionDepth >= 3000) fatalParserError("Maximum recursion depth reached during parsing."); } -- cgit v1.2.3