diff options
| author | Courtney Goeltzenleuchter <courtney_g@comcast.net> | 2016-12-21 16:44:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 16:44:28 -0700 |
| commit | ceea1ff9035c9fc3a55e5e2b67e6ddf16ea8c0a0 (patch) | |
| tree | 07e400adc941d117641c3f71706b361a5e98696f /layers/vk_layer_utils.cpp | |
| parent | bee1d3a4e8c0d48dc5f77c26963e792f4c3b306c (diff) | |
| parent | 00a87deb5fc33be4512b71725d2593555de79171 (diff) | |
| download | usermoji-ceea1ff9035c9fc3a55e5e2b67e6ddf16ea8c0a0.tar.xz | |
Merge pull request #1300 from KhronosGroup/161221-fix_string_validation
loader: Fix validation error
Diffstat (limited to 'layers/vk_layer_utils.cpp')
| -rw-r--r-- | layers/vk_layer_utils.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp index 4ad1989b..8d912d71 100644 --- a/layers/vk_layer_utils.cpp +++ b/layers/vk_layer_utils.cpp @@ -695,9 +695,12 @@ VK_LAYER_EXPORT VkStringErrorFlags vk_string_validate(const int max_length, cons int num_char_bytes = 0; int i, j; - for (i = 0; i < max_length; i++) { + for (i = 0; i <= max_length; i++) { if (utf8[i] == 0) { break; + } else if (i == max_length) { + result = VK_STRING_ERROR_LENGTH; + break; } else if ((utf8[i] >= 0xa) && (utf8[i] < 0x7f)) { num_char_bytes = 0; } else if ((utf8[i] & UTF8_ONE_BYTE_MASK) == UTF8_ONE_BYTE_CODE) { |