Merge pull request #109 from xorgy/add-unary-math-check-for-null-before-dereferencing

In addUnaryMath, check for 'child' being null before dereferencing it.

Merge pull request #109 from xorgy/add-unary-math-check-for-null-before-dereferencing
27657498 · John Kessenich · 8481679f · af5a1236 · 27657498
Commit 27657498 authored Dec 06, 2015 by John Kessenich
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Intermediate.cpp glslang/MachineIndependent/Intermediate.cpp +2 -2

No files found.
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -189,10 +189,10 @@ TIntermTyped* TIntermediate::addIndex(TOperator op, TIntermTyped* base, TIntermT
 //
 TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child, TSourceLoc loc)
 {
-    if (child->getType().getBasicType() == EbtBlock)
+    if (child == 0)
        return 0;

-    if (child == 0)
+    if (child->getType().getBasicType() == EbtBlock)
        return 0;

    switch (op) {