[Bf-blender-cvs] [5f442982803] blender-v3.0-release: Fix T92645: Cycles OSL crash due use of uninitialized pointer

[Brecht Van Lommel]

Commit: 5f442982803e50d4add20950106971cde565f3cb
Author: Brecht Van Lommel
Date:   Tue Nov 9 14:56:22 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB5f442982803e50d4add20950106971cde565f3cb

Fix T92645: Cycles OSL crash due use of uninitialized pointer

Thanks to Ilja Razinkov for identifying the problem and solution.

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

M	intern/cycles/kernel/osl/shader.cpp

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

diff --git a/intern/cycles/kernel/osl/shader.cpp b/intern/cycles/kernel/osl/shader.cpp
index 33633c69e29..ae001b34a1d 100644
--- a/intern/cycles/kernel/osl/shader.cpp
+++ b/intern/cycles/kernel/osl/shader.cpp
@@ -132,10 +132,12 @@ static void shaderdata_to_shaderglobals(const KernelGlobalsCPU *kg,
   /* Used by render-services. */
   sd->osl_globals = kg;
   if (path_flag & PATH_RAY_SHADOW) {
+    sd->osl_path_state = nullptr;
     sd->osl_shadow_path_state = (const IntegratorShadowStateCPU *)state;
   }
   else {
     sd->osl_path_state = (const IntegratorStateCPU *)state;
+    sd->osl_shadow_path_state = nullptr;
   }
 }