commit 193dc48bbbf364977ffbf955996c3fe9e90eca9d
author Shannon Woods <shannonwoods@chromium.org> Wed Jun 26 15:30:09 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:06:06 2013 -0400
tree ae8af89baaa1c75b2c495f69f59b526ef338689c
parent 570e04d8701e37ce3a4ee485afd0f0c4299ff23d

Adds a null check in one additional location in setData

TRAC #23251

Author: Shannon Woods
Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens

src/libGLESv2/renderer/BufferStorage11.cpp

diff --git a/src/libGLESv2/renderer/BufferStorage11.cpp b/src/libGLESv2/renderer/BufferStorage11.cpp
index 87dc414..9ce7846 100644
--- a/src/libGLESv2/renderer/BufferStorage11.cpp
+++ b/src/libGLESv2/renderer/BufferStorage11.cpp
@@ -154,7 +154,7 @@
         mStagingBuffer = newStagingBuffer;
     }
 
-    if (offset != 0 || !createStagingBuffer)
+    if (data && (offset != 0 || !createStagingBuffer))
     {
         D3D11_MAPPED_SUBRESOURCE mappedResource;
         result = context->Map(mStagingBuffer, 0, D3D11_MAP_WRITE, 0, &mappedResource);