mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-02-04 21:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/ns: Use fread when reading from config file

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-06-21 16:43:11 +01:00 committed by Moses Turner
parent 4390b800f2
commit 47470cc8e2
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/xrt/drivers/north_star/ns_hmd.c
View file

@ -496,14 +496,12 @@ ns_config_load(struct ns_hmd *ns, const char *config_path)
goto parse_error;
}
char *json = malloc(file_size + 1);
char *json = calloc(file_size + 1, 1);
json_allocated = true;
size_t i = 0;
while (!feof(config_file)) {
json[i++] = fgetc(config_file);
}
json[i] = '\0';
fread(json, 1, file_size, config_file);
fclose(config_file);
json[file_size] = '\0';
ns->config_json = cJSON_Parse(json);
if (ns->config_json == NULL) {
@ -518,6 +516,7 @@ ns_config_load(struct ns_hmd *ns, const char *config_path)
// this function is not supposed to return true if ns->config_json is NULL
assert(ns->config_json != NULL);
free(json);
return true;
parse_error: