From: Tony Wasserka <redacted>
Date: Sat, 20 Jul 2024 18:49:44 +0000 (+0200)
Subject: vulkan : initialize vk_buffer_struct members to VK_NULL_HANDLE (ggml/893)
X-Git-Tag: upstream/0.0.4488~1012
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=203b7f1531303a060730ec1d1e01920e70302398;p=pkg%2Fggml%2Fsources%2Fllama.cpp

vulkan : initialize vk_buffer_struct members to VK_NULL_HANDLE (ggml/893)

This prevents invalid frees when destroying a partially initialized
vk_buffer_struct. For example, this could happen in ggml_vk_create_buffer
when running out of device memory.

Co-authored-by: Tony Wasserka <redacted>
---

diff --git a/ggml/src/ggml-vulkan.cpp b/ggml/src/ggml-vulkan.cpp
index 74991f6d..fa68360b 100644
--- a/ggml/src/ggml-vulkan.cpp
+++ b/ggml/src/ggml-vulkan.cpp
@@ -236,8 +236,8 @@ struct vk_device_struct {
 };
 
 struct vk_buffer_struct {
-    vk::Buffer buffer;
-    vk::DeviceMemory device_memory;
+    vk::Buffer buffer = VK_NULL_HANDLE;
+    vk::DeviceMemory device_memory = VK_NULL_HANDLE;
     vk::MemoryPropertyFlags memory_property_flags;
     void * ptr;
     size_t size = 0;