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/3553Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fixed infinite loop crash
41827c38 · Alexis Hetu · Alexis Hétu · 146dd310 · 41827c38
Commit 41827c38 authored Jun 23, 2015 by Alexis Hetu Committed by Alexis Hétu Jun 25, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

OutputASM.cpp src/OpenGL/compiler/OutputASM.cpp +8 -2

No files found.
--- a/src/OpenGL/compiler/OutputASM.cpp
+++ b/src/OpenGL/compiler/OutputASM.cpp
@@ -1275,7 +1275,10 @@ namespace glsl
 			}
 			else
 			{
-				condition->traverse(this);
+				if(condition)
+				{
+					condition->traverse(this);
+				}

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

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

-				condition->traverse(this);
+				if(condition)
+				{
+					condition->traverse(this);
+				}

 				emit(sw::Shader::OPCODE_ENDWHILE);
 			}