Skip to content

Commit dd42aa7

Browse files
aizu-mcharles-lunarg
authored andcommitted
size string copies by str_len in copy_str_to_string_list
1 parent 18c25b6 commit dd42aa7

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

loader/loader.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,23 +355,23 @@ VkResult prepend_str_to_string_list(const struct loader_instance *inst, struct l
355355
VkResult copy_str_to_string_list(const struct loader_instance *inst, struct loader_string_list *string_list, const char *str,
356356
size_t str_len) {
357357
assert(string_list && str);
358-
char *new_str = loader_instance_heap_calloc(inst, sizeof(char *) * str_len + 1, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
358+
char *new_str = loader_instance_heap_calloc(inst, str_len + 1, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
359359
if (NULL == new_str) {
360360
return VK_ERROR_OUT_OF_HOST_MEMORY;
361361
}
362-
loader_strncpy(new_str, sizeof(char *) * str_len + 1, str, str_len);
362+
loader_strncpy(new_str, str_len + 1, str, str_len);
363363
new_str[str_len] = '\0';
364364
return append_str_to_string_list(inst, string_list, new_str);
365365
}
366366

367367
VkResult copy_str_to_start_of_string_list(const struct loader_instance *inst, struct loader_string_list *string_list,
368368
const char *str, size_t str_len) {
369369
assert(string_list && str);
370-
char *new_str = loader_instance_heap_calloc(inst, sizeof(char *) * str_len + 1, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
370+
char *new_str = loader_instance_heap_calloc(inst, str_len + 1, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
371371
if (NULL == new_str) {
372372
return VK_ERROR_OUT_OF_HOST_MEMORY;
373373
}
374-
loader_strncpy(new_str, sizeof(char *) * str_len + 1, str, str_len);
374+
loader_strncpy(new_str, str_len + 1, str, str_len);
375375
new_str[str_len] = '\0';
376376
return prepend_str_to_string_list(inst, string_list, new_str);
377377
}

0 commit comments

Comments
 (0)