diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-02-10 15:13:55 -0700 |
|---|---|---|
| committer | Ian Elliott <ianelliott@google.com> | 2016-02-11 09:41:59 -0700 |
| commit | 78fc9dd3af018d95b63ffb25f4e94cb08e9e6617 (patch) | |
| tree | cf16948d1c2afb1c9874b6b9c15fe07eabebe424 /layers/param_checker.cpp | |
| parent | 7490b57472901e0ade746cea34c961b2481bbe23 (diff) | |
| download | usermoji-78fc9dd3af018d95b63ffb25f4e94cb08e9e6617.tar.xz | |
bug-135: param_checker incorrectly checking optional strings
https://gitlab.khronos.org/vulkan/LoaderAndTools/issues/135
Diffstat (limited to 'layers/param_checker.cpp')
| -rw-r--r-- | layers/param_checker.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 3cbfd23e..596e609e 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -1829,11 +1829,15 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance( // support is in place until now, if we survive we can report the issue now. layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); if (pCreateInfo->pApplicationInfo) { - skipCall |= validate_string(my_device_data, "vkCreateInstance()", "VkInstanceCreateInfo->VkApplicationInfo->pApplicationName", - pCreateInfo->pApplicationInfo->pApplicationName); + if (pCreateInfo->pApplicationInfo->pApplicationName) { + skipCall |= validate_string(my_device_data, "vkCreateInstance()", "VkInstanceCreateInfo->VkApplicationInfo->pApplicationName", + pCreateInfo->pApplicationInfo->pApplicationName); + } - skipCall |= validate_string(my_device_data, "vkCreateInstance()", "VkInstanceCreateInfo->VkApplicationInfo->pEngineName", - pCreateInfo->pApplicationInfo->pEngineName); + if (pCreateInfo->pApplicationInfo->pEngineName) { + skipCall |= validate_string(my_device_data, "vkCreateInstance()", "VkInstanceCreateInfo->VkApplicationInfo->pEngineName", + pCreateInfo->pApplicationInfo->pEngineName); + } } return result; |