Skip to content

A
angle
Commit ff39bd87 by Geoff Lang
Options

Add check for size before setting buffer data.

If data is non-null and size is zero, the memory buffer may have a NULL pointer. BUG=angle:765 Change-Id: I4cb8f54ec85fea886e37ee2d4469d26e651a916b Reviewed-on: https://chromium-review.googlesource.com/220801Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent b4fd0c96
Showing with 2 additions and 2 deletions
src/libGLESv2/renderer/d3d/d3d9/Buffer9.cpp
...@@ -41,7 +41,7 @@ gl::Error Buffer9::setData(const void* data, size_t size, GLenum usage) ...@@ -41,7 +41,7 @@ gl::Error Buffer9::setData(const void* data, size_t size, GLenum usage)
} }
mSize = size; mSize = size;
if (data) if (data && size > 0)
{ {
memcpy(mMemory.data(), data, size); memcpy(mMemory.data(), data, size);
} }
...@@ -72,7 +72,7 @@ gl::Error Buffer9::setSubData(const void* data, size_t size, size_t offset) ...@@ -72,7 +72,7 @@ gl::Error Buffer9::setSubData(const void* data, size_t size, size_t offset)
} }
mSize = std::max(mSize, offset + size); mSize = std::max(mSize, offset + size);
if (data) if (data && size > 0)
{ {
memcpy(mMemory.data() + offset, data, size); memcpy(mMemory.data() + offset, data, size);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment