Automated merge with https://bitbucket.org/lindenlab/viewer-cat

2012-09-12 11:47:15 -05:00 · 2012-09-12 11:47:15 -05:00 · 7325a95618
parent d6ea682458 7b6e81ab03
commit 7325a95618
1 changed files with 5 additions and 2 deletions
--- 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
 }