Skip to content

Commit

Permalink
Fix config parser ignoring forbidden "ignore" in template definition
Browse files Browse the repository at this point in the history
fixes #9535
  • Loading branch information
Michael Friedrich authored and gunnarbeutner committed Jul 13, 2015
1 parent 61006d8 commit b423609
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
10 changes: 10 additions & 0 deletions lib/config/config_parser.yy
Expand Up @@ -456,6 +456,7 @@ object:
{
context->m_ObjectAssign.push(true);
context->m_SeenAssign.push(false);
context->m_SeenIgnore.push(false);
context->m_Assign.push(NULL);
context->m_Ignore.push(NULL);
}
Expand All @@ -473,6 +474,9 @@ object:
bool seen_assign = context->m_SeenAssign.top();
context->m_SeenAssign.pop();

bool seen_ignore = context->m_SeenIgnore.top();
context->m_SeenIgnore.pop();

Expression *ignore = context->m_Ignore.top();
context->m_Ignore.pop();

Expand All @@ -491,6 +495,9 @@ object:
filter = new LogicalAndExpression(assign, rex, DebugInfoRange(@2, @5));
} else
filter = assign;
} else if (seen_ignore) {
if (!ObjectRule::IsValidSourceType(type))
BOOST_THROW_EXCEPTION(ScriptError("object rule 'ignore' cannot be used for type '" + type + "'", DebugInfoRange(@2, @4)));
}

$$ = new ObjectExpression(abstract, type, $4, filter, context->GetZone(), $5, $6, DebugInfoRange(@2, @5));
Expand Down Expand Up @@ -600,6 +607,8 @@ lterm: type
if ((context->m_Apply.empty() || !context->m_Apply.top()) && (context->m_ObjectAssign.empty() || !context->m_ObjectAssign.top()))
BOOST_THROW_EXCEPTION(ScriptError("'ignore' keyword not valid in this context.", @$));

context->m_SeenIgnore.top() = true;

if (context->m_Ignore.top())
context->m_Ignore.top() = new LogicalOrExpression(context->m_Ignore.top(), $3, @$);
else
Expand Down Expand Up @@ -1041,6 +1050,7 @@ apply:
{
context->m_Apply.push(true);
context->m_SeenAssign.push(false);
context->m_SeenIgnore.push(false);
context->m_Assign.push(NULL);
context->m_Ignore.push(NULL);
context->m_FKVar.push("");
Expand Down
1 change: 1 addition & 0 deletions lib/config/configcompiler.hpp
Expand Up @@ -130,6 +130,7 @@ class I2_CONFIG_API ConfigCompiler
std::stack<bool> m_Apply;
std::stack<bool> m_ObjectAssign;
std::stack<bool> m_SeenAssign;
std::stack<bool> m_SeenIgnore;
std::stack<Expression *> m_Assign;
std::stack<Expression *> m_Ignore;
std::stack<String> m_FKVar;
Expand Down

0 comments on commit b423609

Please sign in to comment.