diff options
| author | Karl Schultz <karl@lunarg.com> | 2016-04-21 15:57:51 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2016-04-21 15:57:51 -0600 |
| commit | b7a3213de50f36fe1a3b7c32861932f79eb4b154 (patch) | |
| tree | fea7548954f01815dc4ab608907f69237d63013f /layers/core_validation.cpp | |
| parent | d26b05f7fa4d79202cfa54f1864a88eccbac39e9 (diff) | |
| download | usermoji-b7a3213de50f36fe1a3b7c32861932f79eb4b154.tar.xz | |
layers: Reorder to prevent Null deref; add test
Found by running Hologram with validation and push constants
using args "-p -v".
Hologram is issuing a memory barrier in the push constants
mode. This will be fixed in Hologram, but validation should
not be crashing.
Change-Id: I1e76c3fca0152fc3bf8c1de3db3b044f650c202f
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index f7c1622d..57e57313 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -8427,10 +8427,10 @@ static bool ValidateBarriers(const char *funcName, VkCommandBuffer cmdBuffer, ui } auto buffer_data = dev_data->bufferMap.find(mem_barrier->buffer); - VkDeviceSize buffer_size = (buffer_data->second.createInfo.sType == VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO) - ? buffer_data->second.createInfo.size - : 0; if (buffer_data != dev_data->bufferMap.end()) { + VkDeviceSize buffer_size = (buffer_data->second.createInfo.sType == VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO) + ? buffer_data->second.createInfo.size + : 0; if (mem_barrier->offset >= buffer_size) { skip_call |= log_msg( dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, (VkDebugReportObjectTypeEXT)0, 0, __LINE__, |