Fix accessing null pointer when no uniform buffer is bound.

Bug b/30838145 Change-Id: I06aeafa6e7a8aefbc1d4447a9d2607895d07a096 Reviewed-on: https://swiftshader-review.googlesource.com/6950Tested-by: Nicolas Capens <capn@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fix accessing null pointer when no uniform buffer is bound.
b5d3b9c4 · Nicolas Capens · 13241c66 · b5d3b9c4
Commit b5d3b9c4 authored Aug 15, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

Program.cpp src/OpenGL/libGLESv2/Program.cpp +8 -3

No files found.
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -1178,9 +1178,14 @@ namespace es2
 		for(unsigned int bufferBindingIndex = 0; bufferBindingIndex < MAX_UNIFORM_BUFFER_BINDINGS; bufferBindingIndex++)
 		{
 			int index = vertexUniformBuffers[bufferBindingIndex];
-			device->VertexProcessor::setUniformBuffer(bufferBindingIndex, (index != -1) ? uniformBuffers[index].get()->getResource() : nullptr, (index != -1) ? uniformBuffers[index].getOffset() : 0);
-			index = fragmentUniformBuffers[bufferBindingIndex];
-			device->PixelProcessor::setUniformBuffer(bufferBindingIndex, (index != -1) ? uniformBuffers[index].get()->getResource() : nullptr, (index != -1) ? uniformBuffers[index].getOffset() : 0);
+			const gl::BindingPointer<Buffer> &buffer = uniformBuffers[index].get();
+
+			if(buffer)
+			{
+				device->VertexProcessor::setUniformBuffer(bufferBindingIndex, (index != -1) ? buffer->getResource() : nullptr, (index != -1) ? uniformBuffers[index].getOffset() : 0);
+				index = fragmentUniformBuffers[bufferBindingIndex];
+				device->PixelProcessor::setUniformBuffer(bufferBindingIndex, (index != -1) ? buffer->getResource() : nullptr, (index != -1) ? uniformBuffers[index].getOffset() : 0);
+			}
 		}
 	}