Skip to content

Don't crash on null dispatchable handle. #1707

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

Closed
zaiste-linganer wants to merge 1 commit into from
Closed

Don't crash on null dispatchable handle. #1707

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
17 changes: 13 additions & 4 deletions loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkSetDeviceDispatch(VkDevice device, void *object
if (NULL == icd_term || NULL == dev) {
return VK_ERROR_INITIALIZATION_FAILED;
}
loader_set_dispatch(object, &dev->loader_dispatch);
if (object) {
loader_set_dispatch(object, &dev->loader_dispatch);
}
return VK_SUCCESS;
}

Expand Down Expand Up @@ -6082,10 +6084,17 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDevice(VkPhysicalDevice physical
}

*pDevice = dev->icd_device;
loader_add_logical_device(icd_term, dev);

// Init dispatch pointer in new device object
loader_init_dispatch(*pDevice, &dev->loader_dispatch);
if (dev->icd_device != VK_NULL_HANDLE) {
loader_add_logical_device(icd_term, dev);

// Init dispatch pointer in new device object
loader_init_dispatch(*pDevice, &dev->loader_dispatch);
} else {
loader_log(icd_term->this_instance, VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_DRIVER_BIT, 0,
"terminator_CreateDevice: ICD %s returned VK_NULL_HANDLE in vkCreateDevice call",
icd_term->scanned_icd->lib_name);
}

out:
if (NULL != icd_exts.list) {
Expand Down