Don't assume realloc always succeeds

OpenMW · Aug 20, 2024 · 4652151 · 4652151
1 parent 527fa05
commit 4652151
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp
@@ -101,14 +101,22 @@ 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";
+                smallAllocDelta = 0;
+                bigAllocDelta = 0;
+            }
+        }
+        self->mTotalMemoryUsage += smallAllocDelta + bigAllocDelta;
+        self->mSmallAllocMemoryUsage += smallAllocDelta;
 
         if (bigAllocDelta != 0)
         {