diff options
| author | Richard Linden <none@none> | 2013-01-10 17:57:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 17:57:27 -0800 |
| commit | 832cfb3afe5c45304bf6296bc57aac9efa935b3d (patch) | |
| tree | f1b1aff62a61dafc855fee245ae3b4604ccd4f3a /indra | |
| parent | 6bf1e9f585fc945ee60501e69f75a12fd7d320cb (diff) | |
| parent | d89d9cd10ff1fbe6f1f86f0b282075e775ed1b51 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltrace.h | 3 |
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; |