commit 6a471a21f2ed1c56a77253a2b7be7138499fbf71
author Lenny Komow <lenny@lunarg.com> Wed May 09 10:48:41 2018 -0600
committer Lenny Komow <lenny@lunarg.com> Thu May 10 11:10:43 2018 -0600
tree 2c4d84c8c5121738cbc5e0504f2fee1147d82014
parent 22a83ffe45cc709577e5fbd0cb87d4bfb582300f

loader: Fix unhandled out of memory errors

Change-Id: I3b672a9d54e1509b550407f1b4ffae58b48beb85

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index 26ff520..3d3f9be 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2837,6 +2837,10 @@
             cJSON *inst_ext_json = cJSON_GetObjectItem(pre_instance, "vkEnumerateInstanceExtensionProperties");
             if (inst_ext_json) {
                 char *inst_ext_name = cJSON_Print(inst_ext_json);
+                if (inst_ext_name == NULL) {
+                    result = VK_ERROR_OUT_OF_HOST_MEMORY;
+                    goto out;
+                }
                 size_t len = strlen(inst_ext_name) >= MAX_STRING_SIZE ? MAX_STRING_SIZE - 3 : strlen(inst_ext_name) - 2;
                 strncpy(props->pre_instance_functions.enumerate_instance_extension_properties, inst_ext_name + 1, len);
                 props->pre_instance_functions.enumerate_instance_extension_properties[len] = '\0';
@@ -2846,6 +2850,10 @@
             cJSON *inst_layer_json = cJSON_GetObjectItem(pre_instance, "vkEnumerateInstanceLayerProperties");
             if (inst_layer_json) {
                 char *inst_layer_name = cJSON_Print(inst_layer_json);
+                if (inst_layer_name == NULL) {
+                    result = VK_ERROR_OUT_OF_HOST_MEMORY;
+                    goto out;
+                }
                 size_t len = strlen(inst_layer_name) >= MAX_STRING_SIZE ? MAX_STRING_SIZE - 3 : strlen(inst_layer_name) - 2;
                 strncpy(props->pre_instance_functions.enumerate_instance_layer_properties, inst_layer_name + 1, len);
                 props->pre_instance_functions.enumerate_instance_layer_properties[len] = '\0';
@@ -2855,6 +2863,10 @@
             cJSON *inst_version_json = cJSON_GetObjectItem(pre_instance, "vkEnumerateInstanceVersion");
             if (inst_version_json) {
                 char *inst_version_name = cJSON_Print(inst_version_json);
+                if (inst_version_json) {
+                    result = VK_ERROR_OUT_OF_HOST_MEMORY;
+                    goto out;
+                }
                 size_t len = strlen(inst_version_name) >= MAX_STRING_SIZE ? MAX_STRING_SIZE - 3 : strlen(inst_version_name) - 2;
                 strncpy(props->pre_instance_functions.enumerate_instance_version, inst_version_name + 1, len);
                 props->pre_instance_functions.enumerate_instance_version[len] = '\0';