Skip to content

guard android/ios surfaces in terminator_DestroySurfaceKHR #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charles-lunarg merged 1 commit into from
Jun 24, 2026
+16 −0
Merged

guard android/ios surfaces in terminator_DestroySurfaceKHR #1946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions loader/wsi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,22 @@ VKAPI_ATTR void VKAPI_CALL terminator_DestroySurfaceKHR(VkInstance instance, VkS

VkIcdSurface *icd_surface = (VkIcdSurface *)(uintptr_t)(surface);
if (NULL != icd_surface) {
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
if (icd_surface->base.platform == VK_ICD_WSI_PLATFORM_ANDROID) {
// Android surfaces are not loader-created VkIcdSurface objects: they are a smaller VkIcdSurfaceAndroid with no
// surface_index or create_info, so reading those fields would run past the allocation. Just free the handle,
// matching the early-out in wsi_unwrap_icd_surface.
loader_instance_heap_free(loader_inst, (void *)(uintptr_t)surface);
return;
}
#endif // VK_USE_PLATFORM_ANDROID_KHR
#if defined(VK_USE_PLATFORM_MACOS_MVK)
if (icd_surface->base.platform == VK_ICD_WSI_PLATFORM_IOS) {
// Same as Android: an iOS surface is a smaller VkIcdSurfaceIOS without a surface_index or create_info.
loader_instance_heap_free(loader_inst, (void *)(uintptr_t)surface);
return;
}
#endif // VK_USE_PLATFORM_MACOS_MVK
for (struct loader_icd_term *icd_term = loader_inst->icd_terms; icd_term != NULL; icd_term = icd_term->next) {
if (icd_term->enabled_instance_extensions.khr_surface &&
icd_term->scanned_icd->interface_version >= ICD_VER_SUPPORTS_ICD_SURFACE_KHR &&
Expand Down
Loading