mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix two use-after-free warnings

Browse Source 
(cherry picked from commit f27dbb22f0)
This commit is contained in:
Petar Popovic
2025-07-29 19:51:44 +02:00
committed by Sam Lantinga
parent 2a7aa4eae4
commit 46ec859bd1
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gpu/vulkan/SDL_gpu_vulkan.c
View File

@@ -1277,12 +1277,19 @@ static inline const char *VkErrorMessages(VkResult code)
#undef ERR_TO_STR #undef ERR_TO_STR
} }
#define SET_ERROR_AND_RETURN(fmt, msg, ret) \ #define SET_ERROR(fmt, msg) \
do { \ do { \
if (renderer->debugMode) { \ if (renderer->debugMode) { \
SDL_LogError(SDL_LOG_CATEGORY_GPU, fmt, msg); \ SDL_LogError(SDL_LOG_CATEGORY_GPU, fmt, msg); \
} \ } \
SDL_SetError((fmt), (msg)); \ SDL_SetError((fmt), (msg)); \
} while (0)
#define SET_STRING_ERROR(msg) SET_ERROR("%s", msg)
#define SET_ERROR_AND_RETURN(fmt, msg, ret) \
do { \
SET_ERROR(fmt, msg); \
return ret; \ return ret; \
} while (0) } while (0)
@@ -11696,9 +11703,10 @@ static SDL_GPUDevice *VULKAN_CreateDevice(bool debugMode, bool preferLowPower, S
renderer->allowedFramesInFlight = 2; renderer->allowedFramesInFlight = 2;
if (!VULKAN_INTERNAL_PrepareVulkan(renderer)) { if (!VULKAN_INTERNAL_PrepareVulkan(renderer)) {
SET_STRING_ERROR("Failed to initialize Vulkan!");
SDL_free(renderer); SDL_free(renderer);
SDL_Vulkan_UnloadLibrary(); SDL_Vulkan_UnloadLibrary();
SET_STRING_ERROR_AND_RETURN("Failed to initialize Vulkan!", NULL); return NULL;
} }
SDL_LogInfo(SDL_LOG_CATEGORY_GPU, "SDL_GPU Driver: Vulkan"); SDL_LogInfo(SDL_LOG_CATEGORY_GPU, "SDL_GPU Driver: Vulkan");
@@ -11724,9 +11732,10 @@ static SDL_GPUDevice *VULKAN_CreateDevice(bool debugMode, bool preferLowPower, S
if (!VULKAN_INTERNAL_CreateLogicalDevice( if (!VULKAN_INTERNAL_CreateLogicalDevice(
renderer)) { renderer)) {
SET_STRING_ERROR("Failed to create logical device!");
SDL_free(renderer); SDL_free(renderer);
SDL_Vulkan_UnloadLibrary(); SDL_Vulkan_UnloadLibrary();
SET_STRING_ERROR_AND_RETURN("Failed to create logical device!", NULL); return NULL;
} }
// FIXME: just move this into this function // FIXME: just move this into this function