sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T40514: Cycles world MIS segfault

Browse Source
This commit is contained in:
Campbell Barton 2014-06-07 00:08:40 +10:00
parent d53ed58c57
commit 8392e83e13
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/util/util_vector.h
View File

@ -127,8 +127,10 @@ public:
} }
else if(newsize != datasize) { else if(newsize != datasize) {
T *newdata = (T*)malloc_aligned(sizeof(T)*newsize, alignment); T *newdata = (T*)malloc_aligned(sizeof(T)*newsize, alignment);
if(data) {
memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T)); memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T));
free_aligned(data); free_aligned(data);
}
data = newdata; data = newdata;
datasize = newsize; datasize = newsize;