commit e8d7d8813e602964b0d152d39398a903ce454253
author Charles Giessen <charles@lunarg.com> Mon Feb 03 10:28:04 2020 -0700
committer Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> Tue Feb 04 14:36:08 2020 -0700
tree 1dbdf0a22110726e2462ba0cdc492d5ef5499edd
parent 02e2744ed4b3ac3c82000b2118bf18c2aadbced4

loader: add null check to loaderValidateLayers

The loader will now make sure to check if utf8 is null before
validating the string, preventing needless segfaults.

Change-Id: I48139e56719e3c518b85f2ded1ca0b682447413f

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 1ba1b30..c57c789 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -7237,6 +7237,10 @@
     int num_char_bytes = 0;
     int i, j;
 
+    if (utf8 == NULL) {
+        return VK_STRING_ERROR_NULL_PTR;
+    }
+
     for (i = 0; i <= max_length; i++) {
         if (utf8[i] == 0) {
             break;

loader/loader.h

diff --git a/loader/loader.h b/loader/loader.h
index 7e6d601..5e94955 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -67,6 +67,7 @@
     VK_STRING_ERROR_NONE = 0x00000000,
     VK_STRING_ERROR_LENGTH = 0x00000001,
     VK_STRING_ERROR_BAD_DATA = 0x00000002,
+    VK_STRING_ERROR_NULL_PTR = 0x00000004,
 } VkStringErrorFlagBits;
 typedef VkFlags VkStringErrorFlags;