CPoolsSA: properly handle allocation failure

Dutchman101 · web-flow · commit a49ce037dab3 · 2025-08-11T20:31:19.000Z
diff --git a/Client/game_sa/CPoolsSA.cpp b/Client/game_sa/CPoolsSA.cpp
@@ -26,6 +26,7 @@
 #include "CWorldSA.h"
 
 #include "enums/VehicleClass.h"
+#include <new>
 
 extern CGameSA* pGame;
 
@@ -242,7 +243,7 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool
 
     if (m_objectPool.ulCount < MAX_OBJECTS)
     {
-        pObject = new CObjectSA(dwModelID, bBreakingDisabled);
+        pObject = new (std::nothrow) CObjectSA(dwModelID, bBreakingDisabled);
 
         if (pObject && AddObjectToPool(pClientObject, pObject))
         {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include "CWorldSA.h"`
`27`	`27`
`28`	`28`	`#include "enums/VehicleClass.h"`
	`29`	`+#include <new>`
`29`	`30`
`30`	`31`	`extern CGameSA* pGame;`
`31`	`32`
`@@ -242,7 +243,7 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool`
`242`	`243`
`243`	`244`	`if (m_objectPool.ulCount < MAX_OBJECTS)`
`244`	`245`	`{`
`245`		`- pObject = new CObjectSA(dwModelID, bBreakingDisabled);`
	`246`	`+ pObject = new (std::nothrow) CObjectSA(dwModelID, bBreakingDisabled);`
`246`	`247`
`247`	`248`	`if (pObject && AddObjectToPool(pClientObject, pObject))`
`248`	`249`	`{`