From 548bfda290b556d3ab29cc8c2f810f4cc349c9d8 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 28 Sep 2021 16:53:04 -0400
Subject: SL-16040: operator new() must never return nullptr.

---
 indra/llcommon/llcommon.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llcommon')

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;
-- 
cgit v1.2.3


From db86ec9176dcbfabe5fddb3603da4132443f8b7f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 28 Sep 2021 22:09:02 -0400
Subject: SL-16040: _aligned_malloc() and _aligned_free() are Microsoft only.

Fortunately we already have platform-independent wrappers in llmemory.h.
---
 indra/llcommon/llcommon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 92f4d569b1..5d4a623bf6 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -61,7 +61,7 @@ void operator delete(void *ptr) noexcept
 
 void *tracy_aligned_malloc(size_t size, size_t alignment)
 {
-    auto ptr = (_aligned_malloc) (size, alignment);
+    auto ptr = ll_aligned_malloc_fallback(size, alignment);
     if (ptr) TracyAlloc(ptr, size);
     return ptr;
 }
@@ -69,7 +69,7 @@ void *tracy_aligned_malloc(size_t size, size_t alignment)
 void tracy_aligned_free(void *memblock)
 {
     TracyFree(memblock);
-    (_aligned_free)(memblock);
+    ll_aligned_free_fallback(memblock);
 }
 
 #endif
-- 
cgit v1.2.3