blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T74537: Fixed out of bounds memory access in Cycles' PMJ sampler.

This commit is contained in:
Stefan Werner 2020-03-08 21:31:47 +01:00
parent 668b64380a
commit bc6bbe5fac
Notes: blender-bot 2023-02-14 01:35:49 +01:00 
Referenced by issue #74537, Adaptive sampling + AO color node crashes (when shader rays exceed 32K).
Referenced by issue #74531, File Browser not show image preview when set Display As `thumbnail` untill file browser window is resized
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/kernel_jitter.h
View File

@ -198,7 +198,7 @@ ccl_device void cmj_sample_2D(int s, int N, int p, float *fx, float *fy)
ccl_device float pmj_sample_1D(KernelGlobals *kg, int sample, int rng_hash, int dimension)
{
/* Fallback to random */
if (sample > NUM_PMJ_SAMPLES) {
if (sample >= NUM_PMJ_SAMPLES) {
int p = rng_hash + dimension;
return cmj_randfloat(sample, p);
}
@ -211,10 +211,11 @@ ccl_device float pmj_sample_1D(KernelGlobals *kg, int sample, int rng_hash, int
ccl_device void pmj_sample_2D(
KernelGlobals *kg, int sample, int rng_hash, int dimension, float *fx, float *fy)
{
if (sample > NUM_PMJ_SAMPLES) {
if (sample >= NUM_PMJ_SAMPLES) {
int p = rng_hash + dimension;
*fx = cmj_randfloat(sample, p);
*fy = cmj_randfloat(sample, p + 1);
return;
}
uint tmp_rng = cmj_hash_simple(dimension, rng_hash);
int index = ((dimension % NUM_PMJ_PATTERNS) * NUM_PMJ_SAMPLES + sample) * 2;