summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lltrace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 7694f65441..ab4ad59e3d 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -680,7 +680,8 @@ void* allocAligned(size_t size)
#elif LL_DARWIN
padded_allocation = ll_aligned_malloc(size_with_reserve, ALIGNMENT);
#else
- posix_memalign(&padded_allocation, ALIGNMENT, size_with_reserve);
+ if (LL_UNLIKELY(0 != posix_memalign(&padded_allocation, 16, size)))
+ padded_allocation = NULL;
#endif
}
return (char*)padded_allocation + aligned_reserve;