Zebediah Figura : vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref().

Alexandre Julliard julliard at winehq.org
Mon Sep 27 15:20:04 CDT 2021


Module: vkd3d
Branch: master
Commit: 14e9a1ba1c6b8403e3df5522ae763aed5a8f1f45
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=14e9a1ba1c6b8403e3df5522ae763aed5a8f1f45

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Sep 23 16:47:02 2021 -0500

vkd3d-shader/hlsl: Don't dereference a NULL offset_node in hlsl_offset_from_deref().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/hlsl_codegen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 9efc3da..6f8bece 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1201,7 +1201,7 @@ unsigned int hlsl_offset_from_deref(const struct hlsl_deref *deref)
     if (offset_node->type != HLSL_IR_CONSTANT)
     {
         FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type));
-        offset_node = NULL;
+        return 0;
     }
 
     return hlsl_ir_constant(offset_node)->value[0].u;




More information about the wine-cvs mailing list