godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #80288 from pkpro/memcpy_into_nullptr

Browse Source 
Vulkan: Fix sanitizers error with empty shader name
This commit is contained in:
Rémi Verschelde
2023-08-17 12:29:29 +02:00
parent 08690d6af5 77b02359c9
commit c1dbc3dd04
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/vulkan/rendering_device_vulkan.cpp
View File

@@ -4812,12 +4812,15 @@ Vector<uint8_t> RenderingDeviceVulkan::shader_compile_binary_from_spirv(const Ve
offset += sizeof(uint32_t); offset += sizeof(uint32_t);
memcpy(binptr + offset, &binary_data, sizeof(RenderingDeviceVulkanShaderBinaryData)); memcpy(binptr + offset, &binary_data, sizeof(RenderingDeviceVulkanShaderBinaryData));
offset += sizeof(RenderingDeviceVulkanShaderBinaryData); offset += sizeof(RenderingDeviceVulkanShaderBinaryData);
if (binary_data.shader_name_len > 0) {
memcpy(binptr + offset, shader_name_utf.ptr(), binary_data.shader_name_len); memcpy(binptr + offset, shader_name_utf.ptr(), binary_data.shader_name_len);
offset += binary_data.shader_name_len; offset += binary_data.shader_name_len;
if ((binary_data.shader_name_len % 4) != 0) { // Alignment rules are really strange. if ((binary_data.shader_name_len % 4) != 0) { // Alignment rules are really strange.
offset += 4 - (binary_data.shader_name_len % 4); offset += 4 - (binary_data.shader_name_len % 4);
} }
}
for (int i = 0; i < uniform_info.size(); i++) { for (int i = 0; i < uniform_info.size(); i++) {
int count = uniform_info[i].size(); int count = uniform_info[i].size();