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: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Add check for size before setting buffer data.
ff39bd87 · Geoff Lang · b4fd0c96 · ff39bd87
Commit ff39bd87 authored Oct 01, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Buffer9.cpp src/libGLESv2/renderer/d3d/d3d9/Buffer9.cpp +2 -2

No files found.
--- a/src/libGLESv2/renderer/d3d/d3d9/Buffer9.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d9/Buffer9.cpp
@@ -41,7 +41,7 @@ gl::Error Buffer9::setData(const void* data, size_t size, GLenum usage)
    }

    mSize = size;
-    if (data)
+    if (data && size > 0)
    {
        memcpy(mMemory.data(), data, size);
    }
@@ -72,7 +72,7 @@ gl::Error Buffer9::setSubData(const void* data, size_t size, size_t offset)
    }

    mSize = std::max(mSize, offset + size);
-    if (data)
+    if (data && size > 0)
    {
        memcpy(mMemory.data() + offset, data, size);
    }