mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Kessenich 2017-04-18 14:47:33 -06:00
parent d1141843c0
commit 2aa12b1c05
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hlsl/hlslGrammar.cpp
View File

@ -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);