commit 72ba85bf7a8370152b377484e84cd9982cc29d18
author Olli Etuaho <oetuaho@nvidia.com> Wed Mar 04 14:23:26 2015 +0200
committer Zhenyao Mo <zmo@chromium.org> Wed Mar 04 18:53:11 2015 +0000
tree b701660686cc6653795555eecdde1bdbff1cdc6d
parent 95cd3c689ab7f5fb4d2919bdbb3ce2359965fc11

Fix regression in addFunctionCallOrMethod

Fix a crash when parsing a shader with incorrect constructor arguments.

BUG=angleproject:911
TEST=WebGL conformance tests

Change-Id: I3459612f36185db861a361fa916cc6b671795037
Reviewed-on: https://chromium-review.googlesource.com/255870
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 6b90c00..eb45b27 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2815,7 +2815,8 @@
             //
             callNode = addConstructor(node, &type, op, fnCall, loc);
         }
-        else
+
+        if (callNode == nullptr)
         {
             recover();
             callNode = intermediate.setAggregateOperator(nullptr, op, loc);