Merge branch 'realloc' into 'master'

Don't assume realloc always succeeds See merge request OpenMW/openmw!4331
OpenMW · Aug 23, 2024 · 830a26f · 830a26f
2 parents 3c0353e + aa808d6
commit 830a26f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
@@ -101,14 +101,21 @@ namespace LuaUtil
                               << " is blocked because Lua memory limit (configurable in settings.cfg) is exceeded";
             return nullptr;
         }
-        self->mTotalMemoryUsage += smallAllocDelta + bigAllocDelta;
-        self->mSmallAllocMemoryUsage += smallAllocDelta;
 
         void* newPtr = nullptr;
         if (nsize == 0)
             free(ptr);
         else
+        {
             newPtr = realloc(ptr, nsize);
+            if (!newPtr)
+            {
+                Log(Debug::Error) << "Lua realloc " << osize << "->" << nsize << " failed";
+                return nullptr;
+            }
+        }
+        self->mTotalMemoryUsage += smallAllocDelta + bigAllocDelta;
+        self->mSmallAllocMemoryUsage += smallAllocDelta;
 
         if (bigAllocDelta != 0)
         {