[PATCH 0/1] MR6334: winevulkan: Fix pointer arithmetic in debug utils callback marshalling.

[Elizabeth Figura (＠zfigura)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6334

[PATCH 1/1] winevulkan: Fix pointer arithmetic in debug utils callback marshalling.

[Elizabeth Figura]

From: Elizabeth Figura <zfigura(a)codeweavers.com>

Fixes: 4849e7ff8dc8d788bdc1dc23a0b4c5ca2c14b33e
---
 dlls/winevulkan/loader.c | 2 +-
 dlls/winevulkan/vulkan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c
index 5e32490e610..82e0f9d9eb6 100644
--- a/dlls/winevulkan/loader.c
+++ b/dlls/winevulkan/loader.c
@@ -280,7 +280,7 @@ static NTSTATUS WINAPI call_vulkan_debug_utils_callback(void *args, ULONG size)
     size += sizeof(struct debug_utils_object) * data.objectCount;
 
     ptr = (char *)(params + 1);
-    strings = (char *)(params + size);
+    strings = (char *)params + size;
 
     if (params->has_address_binding) data.pNext = &address_binding;
     if (params->message_id_name_len) data.pMessageIdName = strings;
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 041fb4c4c4b..8e7c094637d 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -238,11 +238,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB
 
     size = sizeof(*params);
     size += sizeof(*labels) * (callback_data->queueLabelCount + callback_data->cmdBufLabelCount);
-    size += sizeof(*object) * callback_data->objectCount;
+    size += sizeof(*objects) * callback_data->objectCount;
 
     if (!(params = malloc(size + strings_len))) return VK_FALSE;
     ptr = (char *)(params + 1);
-    strings = (char *)(params + size);
+    strings = (char *)params + size;
 
     params->user_callback = object->user_callback;
     params->user_data = object->user_data;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6334