| commit | cce8463ea36ba47f061087ca3a84c708fffde3ef | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Wed Jun 10 16:09:20 2015 -0400 |
| committer | Nicolas Capens <capn@google.com> | Wed Jun 10 20:13:51 2015 +0000 |
| tree | f966aa0d74fa69212ce8e1e79eca9d6c1f62f7a7 | |
| parent | 20c6f3429c85b00305893370e9a315df09e81b8c [diff] |
Fix potential null pointer dereference. Change-Id: I12249cc2e647296eb45f9e7f9082fe3b477b9011 Reviewed-on: https://swiftshader-review.googlesource.com/3463 Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Shader/VertexRoutine.cpp b/src/Shader/VertexRoutine.cpp index 61bca55..fc6aa72 100644 --- a/src/Shader/VertexRoutine.cpp +++ b/src/Shader/VertexRoutine.cpp
@@ -52,7 +52,7 @@ Registers r(shader); r.data = data; r.constants = *Pointer<Pointer<Byte> >(data + OFFSET(DrawData,constants)); - if(shader->instanceIdDeclared) + if(shader && shader->instanceIdDeclared) { r.instanceID = *Pointer<Int>(data + OFFSET(DrawData, instanceID)); }