From: Richard Huang <r.huang@samsung.com>
Date: Tue, 9 Mar 2021 15:40:23 +0000 (+0000)
Subject: Fix potential memory scribbling issue in Render::UniformBuffer
X-Git-Tag: graphics-backend-pre-release-3~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4499fbf7517ea9ccbd62c41545551e671c336b1b;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fix potential memory scribbling issue in Render::UniformBuffer

Change-Id: If9bc93b3ab46919432844b9f8a33fef01968edf8
---

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<char*>(ptr) + dstOffset, data, size);
+      memcpy(ptr, data, size);
     }
     mMemory->Unlock(true);
   }