diff options
author | Yahan Zhou <yahan@google.com> | 2024-01-31 10:22:43 -0800 |
---|---|---|
committer | Yahan Zhou <yahan@google.com> | 2024-01-31 21:11:58 +0000 |
commit | 71f22b2fd1c27fc9cb83f822b0aeab771dabc40e (patch) | |
tree | b6e21a0a5383d83ce44f0160fbb45f9e89546b9d | |
parent | 3799ff22734fb52fe1805c41b3db2f33e3d32209 (diff) | |
download | gfxstream-71f22b2fd1c27fc9cb83f822b0aeab771dabc40e.tar.gz |
Try not to use nullptr in vsnprintf for %semu-34-dev
It could trigger undefined behavior on Windows.
Bug: 323071431
Test: open chrome and play videos
Change-Id: I7736053459c3f749b713699145e063bc95f74271
-rw-r--r-- | host/vulkan/VkDecoderGlobalState.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/host/vulkan/VkDecoderGlobalState.cpp b/host/vulkan/VkDecoderGlobalState.cpp index 065c9b65..69475e09 100644 --- a/host/vulkan/VkDecoderGlobalState.cpp +++ b/host/vulkan/VkDecoderGlobalState.cpp @@ -5485,48 +5485,48 @@ class VkDecoderGlobalState::Impl { ERR("The VkImageCreateInfo to import %s contains unsupported VkImageCreateFlags. " "All supported VkImageCreateFlags are %s, the input VkImageCreateInfo requires " "support for %s.", - importSource.c_str(), - string_VkImageCreateFlags(colorBufferVkImageCi->flags).c_str(), - string_VkImageCreateFlags(imageCreateInfo.flags).c_str()); + importSource.c_str()?:"", + string_VkImageCreateFlags(colorBufferVkImageCi->flags).c_str()?:"", + string_VkImageCreateFlags(imageCreateInfo.flags).c_str()?:""); } imageCreateInfo.flags |= colorBufferVkImageCi->flags; if (imageCreateInfo.imageType != colorBufferVkImageCi->imageType) { ERR("The VkImageCreateInfo to import %s has an unexpected VkImageType: %s, %s " "expected.", - importSource.c_str(), string_VkImageType(imageCreateInfo.imageType), + importSource.c_str()?:"", string_VkImageType(imageCreateInfo.imageType), string_VkImageType(colorBufferVkImageCi->imageType)); } if (imageCreateInfo.extent.depth != colorBufferVkImageCi->extent.depth) { ERR("The VkImageCreateInfo to import %s has an unexpected VkExtent::depth: %" PRIu32 ", %" PRIu32 " expected.", - importSource.c_str(), imageCreateInfo.extent.depth, + importSource.c_str()?:"", imageCreateInfo.extent.depth, colorBufferVkImageCi->extent.depth); } if (imageCreateInfo.mipLevels != colorBufferVkImageCi->mipLevels) { ERR("The VkImageCreateInfo to import %s has an unexpected mipLevels: %" PRIu32 ", %" PRIu32 " expected.", - importSource.c_str(), imageCreateInfo.mipLevels, + importSource.c_str()?:"", imageCreateInfo.mipLevels, colorBufferVkImageCi->mipLevels); } if (imageCreateInfo.arrayLayers != colorBufferVkImageCi->arrayLayers) { ERR("The VkImageCreateInfo to import %s has an unexpected arrayLayers: %" PRIu32 ", %" PRIu32 " expected.", - importSource.c_str(), imageCreateInfo.arrayLayers, + importSource.c_str()?:"", imageCreateInfo.arrayLayers, colorBufferVkImageCi->arrayLayers); } if (imageCreateInfo.samples != colorBufferVkImageCi->samples) { ERR("The VkImageCreateInfo to import %s has an unexpected VkSampleCountFlagBits: " "%s, %s expected.", - importSource.c_str(), string_VkSampleCountFlagBits(imageCreateInfo.samples), + importSource.c_str()?:"", string_VkSampleCountFlagBits(imageCreateInfo.samples), string_VkSampleCountFlagBits(colorBufferVkImageCi->samples)); } if (imageCreateInfo.usage & (~colorBufferVkImageCi->usage)) { ERR("The VkImageCreateInfo to import %s contains unsupported VkImageUsageFlags. " "All supported VkImageUsageFlags are %s, the input VkImageCreateInfo requires " "support for %s.", - importSource.c_str(), - string_VkImageUsageFlags(colorBufferVkImageCi->usage).c_str(), - string_VkImageUsageFlags(imageCreateInfo.usage).c_str()); + importSource.c_str()?:"", + string_VkImageUsageFlags(colorBufferVkImageCi->usage).c_str()?:"", + string_VkImageUsageFlags(imageCreateInfo.usage).c_str()?:""); } imageCreateInfo.usage |= colorBufferVkImageCi->usage; // For the AndroidHardwareBuffer binding case VkImageCreateInfo::sharingMode isn't @@ -5538,31 +5538,31 @@ class VkDecoderGlobalState::Impl { if (resolvedFormat != colorBufferVkImageCi->format) { ERR("The VkImageCreateInfo to import %s contains unexpected VkFormat: %s. %s " "expected.", - importSource.c_str(), string_VkFormat(imageCreateInfo.format), + importSource.c_str()?:"", string_VkFormat(imageCreateInfo.format), string_VkFormat(colorBufferVkImageCi->format)); } if (imageCreateInfo.extent.width != colorBufferVkImageCi->extent.width) { ERR("The VkImageCreateInfo to import %s contains unexpected VkExtent::width: " "%" PRIu32 ". %" PRIu32 " expected.", - importSource.c_str(), imageCreateInfo.extent.width, + importSource.c_str()?:"", imageCreateInfo.extent.width, colorBufferVkImageCi->extent.width); } if (imageCreateInfo.extent.height != colorBufferVkImageCi->extent.height) { ERR("The VkImageCreateInfo to import %s contains unexpected VkExtent::height: " "%" PRIu32 ". %" PRIu32 " expected.", - importSource.c_str(), imageCreateInfo.extent.height, + importSource.c_str()?:"", imageCreateInfo.extent.height, colorBufferVkImageCi->extent.height); } if (imageCreateInfo.tiling != colorBufferVkImageCi->tiling) { ERR("The VkImageCreateInfo to import %s contains unexpected VkImageTiling: %s. %s " "expected.", - importSource.c_str(), string_VkImageTiling(imageCreateInfo.tiling), + importSource.c_str()?:"", string_VkImageTiling(imageCreateInfo.tiling), string_VkImageTiling(colorBufferVkImageCi->tiling)); } if (imageCreateInfo.sharingMode != colorBufferVkImageCi->sharingMode) { ERR("The VkImageCreateInfo to import %s contains unexpected VkSharingMode: %s. %s " "expected.", - importSource.c_str(), string_VkSharingMode(imageCreateInfo.sharingMode), + importSource.c_str()?:"", string_VkSharingMode(imageCreateInfo.sharingMode), string_VkSharingMode(colorBufferVkImageCi->sharingMode)); } } |