[Bf-blender-cvs] [8392e83] master: Fix T40514: Cycles world MIS segfault

[Campbell Barton]

Commit: 8392e83e134c4a3d29289e88376425b30c11ac42
Author: Campbell Barton
Date:   Sat Jun 7 00:08:40 2014 +1000
https://developer.blender.org/rB8392e83e134c4a3d29289e88376425b30c11ac42

Fix T40514: Cycles world MIS segfault

===================================================================

M	intern/cycles/util/util_vector.h

===================================================================

diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index 2085177..cc6e8a3 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -127,8 +127,10 @@ public:
 		}
 		else if(newsize != datasize) {
 			T *newdata = (T*)malloc_aligned(sizeof(T)*newsize, alignment);
-			memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T));
-			free_aligned(data);
+			if(data) {
+				memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T));
+				free_aligned(data);
+			}
 
 			data = newdata;
 			datasize = newsize;