From 7b6e81ab03d361cc73c5d2f2fc88e857c7c95e13 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 12 Sep 2012 11:46:43 -0500
Subject: [PATCH] Handle the NULL case on ll_aligned_realloc_16 on linux
---
indra/llcommon/llmemory.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index d4f8c152e9d..e7488a03d77 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -81,8 +81,11 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
#else
//FIXME: memcpy is SLOW
void* ret = ll_aligned_malloc_16(size);
- memcpy(ret, ptr, old_size);
- ll_aligned_free_16(ptr);
+ if (ptr)
+ {
+ memcpy(ret, ptr, old_size);
+ ll_aligned_free_16(ptr);
+ }
return ret;
#endif
}
--
GitLab