From 0dad1645050b6e03db91023348f86d9e76fa420d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 6 Nov 2023 18:34:54 +0100 Subject: [PATCH] Fix #114540: macOS crash on startup after recent changes in c2b755a3c00 Thanks to Michael Parkin-White for finding the cause. Ref #114513 --- source/blender/gpu/metal/mtl_shader_generator.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/gpu/metal/mtl_shader_generator.mm b/source/blender/gpu/metal/mtl_shader_generator.mm index 3e99a6d9cb8..cfdbfc3566a 100644 --- a/source/blender/gpu/metal/mtl_shader_generator.mm +++ b/source/blender/gpu/metal/mtl_shader_generator.mm @@ -622,7 +622,7 @@ void extract_shared_memory_blocks(MSLGeneratorInterface &msl_iface, } int len = c_next_space - c; BLI_assert(len < 256); - BLI_strncpy(buf, c, len); + BLI_strncpy(buf, c, len + 1); new_shared_block.type_name = std::string(buf); /* Read var-name. @@ -662,13 +662,13 @@ void extract_shared_memory_blocks(MSLGeneratorInterface &msl_iface, } len = varname_end - c; BLI_assert(len < 256); - BLI_strncpy(buf, c, len); + BLI_strncpy(buf, c, len + 1); new_shared_block.varname = std::string(buf); /* Determine if array. */ if (new_shared_block.is_array) { int len = c_expr_end - c_array_begin; - BLI_strncpy(buf, c_array_begin, len); + BLI_strncpy(buf, c_array_begin, len + 1); new_shared_block.array_decl = std::string(buf); }