diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-11 13:23:11 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-11 13:39:28 +0300 |
| commit | 96868a39419f1c9a8962c56e02480fabbf1e5156 (patch) | |
| tree | 64128db60a690d0223dad4e6e4073230ffd174ac /intern/cycles/kernel/split | |
| parent | 5afe4c787f0ed3ac30f7609c7f07c5092a20eac9 (diff) | |
Fix T50888: Numeric overflow in split kernel state buffer size calculation
Overflow led to the state buffer being too small and the split kernel to
get stuck doing nothing forever.
Diffstat (limited to 'intern/cycles/kernel/split')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_split_data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/split/kernel_split_data.h b/intern/cycles/kernel/split/kernel_split_data.h index 81dcdbaedde..d319514c190 100644 --- a/intern/cycles/kernel/split/kernel_split_data.h +++ b/intern/cycles/kernel/split/kernel_split_data.h @@ -22,11 +22,11 @@ CCL_NAMESPACE_BEGIN -ccl_device_inline size_t split_data_buffer_size(KernelGlobals *kg, size_t num_elements) +ccl_device_inline uint64_t split_data_buffer_size(KernelGlobals *kg, size_t num_elements) { (void)kg; /* Unused on CPU. */ - size_t size = 0; + uint64_t size = 0; #define SPLIT_DATA_ENTRY(type, name, num) + align_up(num_elements * num * sizeof(type), 16) size = size SPLIT_DATA_ENTRIES; #undef SPLIT_DATA_ENTRY |