openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_vulkan-loader.git synced 2026-07-19 17:13:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

loader: Fix stack overflow with large manifests

Browse Source 
If the json manifest file was too large, the loader would do a stack
allocation that would fail, throwing an exception or creating
undefined behavior. This changes to a heap allocation.
This commit is contained in:
Lenny Komow
2021-04-23 15:02:18 -06:00
parent d4ba01b700
commit db4ba5f086
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loader/loader.c
+5 -2
View File
@@ -2621,7 +2621,7 @@ static void loader_get_fullpath(const char *file, const char *dirs, size_t out_s
// This returned buffer should be freed by caller.
static VkResult loader_get_json(const struct loader_instance *inst, const char *filename, cJSON **json) {
FILE *file = NULL;
char *json_buf;
char *json_buf = NULL;
size_t len;
VkResult res = VK_SUCCESS;
@@ -2647,7 +2647,7 @@ static VkResult loader_get_json(const struct loader_instance *inst, const char *
} while (fread_ret_count == 256 && !feof(file));
len = ftell(file);
fseek(file, 0, SEEK_SET);
json_buf = (char *)loader_stack_alloc(len + 1);
json_buf = (char *)loader_instance_heap_alloc(inst, len + 1, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
if (json_buf == NULL) {
loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0,
"loader_get_json: Failed to allocate space for "
@@ -2681,6 +2681,9 @@ static VkResult loader_get_json(const struct loader_instance *inst, const char *
}
out:
if (NULL != json_buf) {
loader_instance_heap_free(inst, json_buf);
}
if (NULL != file) {
fclose(file);
}