@@ -4785,7 +4785,7 @@ static Uint32 VULKAN_INTERNAL_CreateSwapchain(
4785
4785
4786
4786
windowData -> inFlightFences [i ] = NULL ;
4787
4787
}
4788
-
4788
+
4789
4789
windowData -> renderFinishedSemaphore = SDL_malloc (
4790
4790
sizeof (VkSemaphore ) * windowData -> imageCount );
4791
4791
for (i = 0 ; i < windowData -> imageCount ; i += 1 ) {
@@ -11610,7 +11610,7 @@ static bool VULKAN_PrepareDriver(SDL_VideoDevice *_this)
11610
11610
{
11611
11611
// Set up dummy VulkanRenderer
11612
11612
VulkanRenderer * renderer ;
11613
- Uint8 result ;
11613
+ bool result = false ;
11614
11614
11615
11615
if (_this -> Vulkan_CreateSurface == NULL ) {
11616
11616
return false;
@@ -11620,16 +11620,16 @@ static bool VULKAN_PrepareDriver(SDL_VideoDevice *_this)
11620
11620
return false;
11621
11621
}
11622
11622
11623
- renderer = (VulkanRenderer * )SDL_malloc ( sizeof (VulkanRenderer ));
11624
- SDL_memset ( renderer , '\0' , sizeof ( VulkanRenderer ));
11625
-
11626
- result = VULKAN_INTERNAL_PrepareVulkan ( renderer );
11627
-
11628
- if ( result ) {
11629
- renderer -> vkDestroyInstance (renderer -> instance , NULL );
11623
+ renderer = (VulkanRenderer * )SDL_calloc ( 1 , sizeof (* renderer ));
11624
+ if ( renderer ) {
11625
+ result = VULKAN_INTERNAL_PrepareVulkan ( renderer );
11626
+ if ( result ) {
11627
+ renderer -> vkDestroyInstance ( renderer -> instance , NULL );
11628
+ }
11629
+ SDL_free (renderer );
11630
11630
}
11631
- SDL_free (renderer );
11632
11631
SDL_Vulkan_UnloadLibrary ();
11632
+
11633
11633
return result ;
11634
11634
}
11635
11635
@@ -11650,8 +11650,12 @@ static SDL_GPUDevice *VULKAN_CreateDevice(bool debugMode, bool preferLowPower, S
11650
11650
return NULL ;
11651
11651
}
11652
11652
11653
- renderer = (VulkanRenderer * )SDL_malloc (sizeof (VulkanRenderer ));
11654
- SDL_memset (renderer , '\0' , sizeof (VulkanRenderer ));
11653
+ renderer = (VulkanRenderer * )SDL_calloc (1 , sizeof (* renderer ));
11654
+ if (!renderer ) {
11655
+ SDL_Vulkan_UnloadLibrary ();
11656
+ return false;
11657
+ }
11658
+
11655
11659
renderer -> debugMode = debugMode ;
11656
11660
renderer -> preferLowPower = preferLowPower ;
11657
11661
renderer -> allowedFramesInFlight = 2 ;
0 commit comments