[Bf-blender-cvs] [14094a1] cycles_split_kernel: Cycles: Fix crash caused by freeing unallocated kernel globals
Mai Lavelle
noreply at git.blender.org
Tue Nov 1 16:28:18 CET 2016
Commit: 14094a110b28f22b5bc09f347c0fc18d53096add
Author: Mai Lavelle
Date: Tue Nov 1 16:23:36 2016 +0100
Branches: cycles_split_kernel
https://developer.blender.org/rB14094a110b28f22b5bc09f347c0fc18d53096add
Cycles: Fix crash caused by freeing unallocated kernel globals
===================================================================
M intern/cycles/device/device_cpu.cpp
===================================================================
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index be52fae..ee14f78 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -664,6 +664,10 @@ protected:
inline void thread_kernel_globals_free(KernelGlobals *kg)
{
+ if(!kg) {
+ return;
+ }
+
if(kg->transparent_shadow_intersections != NULL) {
free(kg->transparent_shadow_intersections);
}
More information about the Bf-blender-cvs
mailing list