commit 41827c389051cda8d8b5c8f0dae990108df0b126
author Alexis Hetu <sugoi@google.com> Tue Jun 23 16:37:15 2015 -0400
committer Alexis Hétu <sugoi@google.com> Thu Jun 25 15:43:16 2015 +0000
tree 587197c05b5c948c7e2435855a2f7927bffae119
parent 146dd31010201a27836497276549acd45f39a093

Fixed infinite loop crash

Writing for(;;) in a shader was crashing because
a NULL condition was dereferenced. Added the
NULL pointer check to fix the crash.

Change-Id: I2be7a4594029c928ff83221f65503636bc28f4a9
Reviewed-on: https://swiftshader-review.googlesource.com/3553
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/OutputASM.cpp

diff --git a/src/OpenGL/compiler/OutputASM.cpp b/src/OpenGL/compiler/OutputASM.cpp
index 67aada7..1c54252 100644
--- a/src/OpenGL/compiler/OutputASM.cpp
+++ b/src/OpenGL/compiler/OutputASM.cpp
@@ -1275,7 +1275,10 @@
 			}

 			else

 			{

-				condition->traverse(this);

+				if(condition)

+				{

+					condition->traverse(this);

+				}

 

 				emit(sw::Shader::OPCODE_WHILE, 0, condition);

 

@@ -1291,7 +1294,10 @@
 					expression->traverse(this);

 				}

 

-				condition->traverse(this);

+				if(condition)

+				{

+					condition->traverse(this);

+				}

 

 				emit(sw::Shader::OPCODE_ENDWHILE);

 			}