[Bf-blender-cvs] [f31f740] master: Cycles: Proper fix for buffer overflow in volume intersect all

Sergey Sharybin noreply at git.blender.org
Tue Jul 26 17:16:30 CEST 2016


Commit: f31f740bd03503e98a2a0818ef52cfcf577ac1fd
Author: Sergey Sharybin
Date:   Tue Jul 26 16:56:40 2016 +0200
Branches: master
https://developer.blender.org/rBf31f740bd03503e98a2a0818ef52cfcf577ac1fd

Cycles: Proper fix for buffer overflow in volume intersect all

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

M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index bf8301f..01c87e6 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -1029,7 +1029,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
 	int stack_index = 0, enclosed_index = 0;
 
 #ifdef __VOLUME_RECORD_ALL__
-	Intersection hits[2*VOLUME_STACK_SIZE];
+	Intersection hits[2*VOLUME_STACK_SIZE + 1];
 	uint num_hits = scene_intersect_volume_all(kg,
 	                                           &volume_ray,
 	                                           hits,
@@ -1199,7 +1199,7 @@ ccl_device void kernel_volume_stack_update_for_subsurface(KernelGlobals *kg,
 	Ray volume_ray = *ray;
 
 #  ifdef __VOLUME_RECORD_ALL__
-	Intersection hits[2*VOLUME_STACK_SIZE];
+	Intersection hits[2*VOLUME_STACK_SIZE + 1];
 	uint num_hits = scene_intersect_volume_all(kg,
 	                                           &volume_ray,
 	                                           hits,




More information about the Bf-blender-cvs mailing list