diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-04-05 15:14:46 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 11:35:44 +0200 |
| commit | dce86de8e79d91952c7b21f3bd63bcb1b9f9e7e9 (patch) | |
| tree | 57e9210eb8fbab66736ef35dc79bcafdd88f8b1c /src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp | |
| parent | fab430a4120a74a76862de718eaf2740366d9875 (diff) | |
ANGLE: Avoid memory copies on buffers when data is null
With data=0, ANGLE can crash when setting the buffer data. As this
should be a legal operation, don't perform a memcpy when data is null.
Change-Id: I3fa1260482549b1da50d7a68001a65decb98f258
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp index 7fc14fc073..4468461871 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/BufferStorage9.cpp @@ -54,7 +54,8 @@ void BufferStorage9::setData(const void* data, unsigned int size, unsigned int o } mSize = std::max(mSize, offset + size); - memcpy(reinterpret_cast<char*>(mMemory) + offset, data, size); + if (data) + memcpy(reinterpret_cast<char*>(mMemory) + offset, data, size); } void BufferStorage9::clear() |