Make realloc usage consistent

Makes sure all calls to realloc have their return value put into a new variable.
That way we don't lose the pointer to the original allocation in case realloc
returns NULL and we need to free the original allocation.

Author: charles-lunarg

loader/loader.c

@@ -317,11 +317,12 @@ VkResult increase_str_capacity_by_at_least_one(const struct loader_instance *ins
         }
     } else if (string_list->count + 1 > string_list->allocated_count) {
         uint32_t new_allocated_count = string_list->allocated_count * 2;
-        string_list->list = loader_instance_heap_realloc(inst, string_list->list, sizeof(char *) * string_list->allocated_count,
-                                                         sizeof(char *) * new_allocated_count, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
-        if (NULL == string_list->list) {
+        void *new_ptr = loader_instance_heap_realloc(inst, string_list->list, sizeof(char *) * string_list->allocated_count,
+                                                     sizeof(char *) * new_allocated_count, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+        if (NULL == new_ptr) {
             return VK_ERROR_OUT_OF_HOST_MEMORY;
         }
+        string_list->list = new_ptr;
         string_list->allocated_count *= 2;
     }
     return VK_SUCCESS;
@@ -1045,12 +1046,13 @@ VkResult loader_init_generic_list(const struct loader_instance *inst, struct loa
 }
 
 VkResult loader_resize_generic_list(const struct loader_instance *inst, struct loader_generic_list *list_info) {
-    list_info->list = loader_instance_heap_realloc(inst, list_info->list, list_info->capacity, list_info->capacity * 2,
-                                                   VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
-    if (list_info->list == NULL) {
+    void *new_ptr = loader_instance_heap_realloc(inst, list_info->list, list_info->capacity, list_info->capacity * 2,
+                                                 VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+    if (new_ptr == NULL) {
         loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0, "loader_resize_generic_list: Failed to allocate space for generic list");
         return VK_ERROR_OUT_OF_HOST_MEMORY;
     }
+    list_info->list = new_ptr;
     list_info->capacity = list_info->capacity * 2;
     return VK_SUCCESS;
 }

loader/loader_windows.c

@@ -817,12 +817,13 @@ VkResult enumerate_adapter_physical_devices(struct loader_instance *inst, struct
 
     // Get the actual physical devices
     do {
-        next_icd_phys_devs->physical_devices = loader_instance_heap_realloc(
-            inst, next_icd_phys_devs->physical_devices, next_icd_phys_devs->device_count * sizeof(VkPhysicalDevice),
-            count * sizeof(VkPhysicalDevice), VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
-        if (next_icd_phys_devs->physical_devices == NULL) {
+        void *new_ptr = loader_instance_heap_realloc(inst, next_icd_phys_devs->physical_devices,
+                                                     next_icd_phys_devs->device_count * sizeof(VkPhysicalDevice),
+                                                     count * sizeof(VkPhysicalDevice), VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
+        if (new_ptr == NULL) {
             return VK_ERROR_OUT_OF_HOST_MEMORY;
         }
+        next_icd_phys_devs->physical_devices = new_ptr;
         next_icd_phys_devs->device_count = count;
     } while ((res = icd_term->scanned_icd->EnumerateAdapterPhysicalDevices(icd_term->instance, luid, &count,
                                                                            next_icd_phys_devs->physical_devices)) == VK_INCOMPLETE);
@@ -978,13 +979,14 @@ VkResult windows_read_sorted_physical_devices(struct loader_instance *inst, uint
 
             if (icd_phys_devs_array_size <= *icd_phys_devs_array_count) {
                 uint32_t old_size = icd_phys_devs_array_size * sizeof(struct loader_icd_physical_devices);
-                *icd_phys_devs_array = loader_instance_heap_realloc(inst, *icd_phys_devs_array, old_size, 2 * old_size,
-                                                                    VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
+                void *new_ptr = loader_instance_heap_realloc(inst, *icd_phys_devs_array, old_size, 2 * old_size,
+                                                             VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
                 if (*icd_phys_devs_array == NULL) {
                     adapter->lpVtbl->Release(adapter);
                     res = VK_ERROR_OUT_OF_HOST_MEMORY;
                     goto out;
                 }
+                *icd_phys_devs_array = new_ptr;
                 icd_phys_devs_array_size *= 2;
             }
             (*icd_phys_devs_array)[*icd_phys_devs_array_count].device_count = 0;