From 4499fbf7517ea9ccbd62c41545551e671c336b1b Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 9 Mar 2021 15:40:23 +0000 Subject: [PATCH] Fix potential memory scribbling issue in Render::UniformBuffer Change-Id: If9bc93b3ab46919432844b9f8a33fef01968edf8 --- dali/internal/render/renderers/uniform-buffer-manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dali/internal/render/renderers/uniform-buffer-manager.cpp b/dali/internal/render/renderers/uniform-buffer-manager.cpp index 0828ea5..828cfae 100644 --- a/dali/internal/render/renderers/uniform-buffer-manager.cpp +++ b/dali/internal/render/renderers/uniform-buffer-manager.cpp @@ -125,10 +125,10 @@ void UniformBuffer::Write(const void* data, uint32_t size, uint32_t dstOffset) if(mMemory) { - void* ptr = mMemory->LockRegion(0, size); - if(dstOffset + size < mSize) + void* ptr = mMemory->LockRegion(dstOffset, size); + if(ptr && dstOffset + size < mSize) { - memcpy(reinterpret_cast(ptr) + dstOffset, data, size); + memcpy(ptr, data, size); } mMemory->Unlock(true); } -- 2.7.4