From 2aa12b1c05b4aa344a4af461f3af2b4ac1949cf8 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Tue, 18 Apr 2017 14:47:33 -0600
Subject: [PATCH] HLSL: Address #839: avoid crash by distinguishing between bad
argument and no argument.
---
hlsl/hlslGrammar.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index f58f74204..32b1de351 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -2926,11 +2926,16 @@ bool HlslGrammar::acceptArguments(TFunction* function, TIntermTyped*& arguments)
if (! acceptTokenClass(EHTokLeftParen))
return false;
+ // RIGHT_PAREN
+ if (acceptTokenClass(EHTokRightParen))
+ return true;
+
+ // must now be at least one expression...
do {
// expression
TIntermTyped* arg;
if (! acceptAssignmentExpression(arg))
- break;
+ return false;
// hook it up
parseContext.handleFunctionArgument(function, arguments, arg);
--
GitLab