Commit 2aa12b1c by John Kessenich

HLSL: Address #839: avoid crash by distinguishing between bad argument and no argument.

parent d1141843
...@@ -2926,11 +2926,16 @@ bool HlslGrammar::acceptArguments(TFunction* function, TIntermTyped*& arguments) ...@@ -2926,11 +2926,16 @@ bool HlslGrammar::acceptArguments(TFunction* function, TIntermTyped*& arguments)
if (! acceptTokenClass(EHTokLeftParen)) if (! acceptTokenClass(EHTokLeftParen))
return false; return false;
// RIGHT_PAREN
if (acceptTokenClass(EHTokRightParen))
return true;
// must now be at least one expression...
do { do {
// expression // expression
TIntermTyped* arg; TIntermTyped* arg;
if (! acceptAssignmentExpression(arg)) if (! acceptAssignmentExpression(arg))
break; return false;
// hook it up // hook it up
parseContext.handleFunctionArgument(function, arguments, arg); parseContext.handleFunctionArgument(function, arguments, arg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment