summaryrefslogtreecommitdiff
path: root/indra/llcommon/llcommon.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-09-28 16:53:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-09-28 16:53:04 -0400
commit548bfda290b556d3ab29cc8c2f810f4cc349c9d8 (patch)
tree72a9b64d2d506961dcc36bc9688f7ef151198e6e /indra/llcommon/llcommon.cpp
parent3e12a97a7f0dfa951c3997dd2117d2418fe21ce6 (diff)
SL-16040: operator new() must never return nullptr.
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
-rw-r--r--indra/llcommon/llcommon.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index da61e7539a..92f4d569b1 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -34,14 +34,13 @@
#include "llcleanup.h"
#if (TRACY_ENABLE)
-// Override new/delet for tracy memory profiling
+// Override new/delete for tracy memory profiling
void *operator new(size_t size)
{
auto ptr = (malloc) (size);
if (!ptr)
{
throw std::bad_alloc();
- return nullptr;
}
TracyAlloc(ptr, size);
return ptr;