From 3bc67ca00f028a6783b0884c7d93b8181a737376 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 30 Mar 2026 22:55:29 -0700 Subject: [PATCH] Fix heap corruption and memory leak in UniformBuffer move assignment --- filament/src/UniformBuffer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/filament/src/UniformBuffer.cpp b/filament/src/UniformBuffer.cpp index 060aeac317..f1ad4fa497 100644 --- a/filament/src/UniformBuffer.cpp +++ b/filament/src/UniformBuffer.cpp @@ -59,14 +59,19 @@ UniformBuffer::UniformBuffer(UniformBuffer&& rhs) noexcept UniformBuffer& UniformBuffer::operator=(UniformBuffer&& rhs) noexcept { if (this != &rhs) { mSomethingDirty = rhs.mSomethingDirty; + if (mBuffer && !isLocalStorage()) { + free(mBuffer, mSize); + } if (UTILS_LIKELY(rhs.isLocalStorage())) { mBuffer = mStorage; mSize = rhs.mSize; memcpy(mBuffer, rhs.mBuffer, rhs.mSize); } else { - std::swap(mBuffer, rhs.mBuffer); - std::swap(mSize, rhs.mSize); + mBuffer = rhs.mBuffer; + mSize = rhs.mSize; } + rhs.mBuffer = nullptr; + rhs.mSize = 0; } return *this; }