mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a/util: Make JSON reading more robust.

Browse source 
We were missing some null checks.
This commit is contained in:
Ryan Pavlik 2021-04-23 17:31:07 -05:00 committed by Christoph Haag
parent cfbb81cb71
commit 23c73e145b
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/changes/misc_fixes/mr.785.md Normal file
View file

@ -0,0 +1 @@
Make config file reading more robust.

14
src/xrt/auxiliary/util/u_config_json.c
View file

@ -97,6 +97,9 @@ get_obj(cJSON *json, const char *name)
XRT_MAYBE_UNUSED static bool
get_obj_bool(cJSON *json, const char *name, bool *out_bool)
{
if (json == NULL) {
return false;
}
cJSON *item = get_obj(json, name);
if (item == NULL) {
return false;
@ -113,6 +116,9 @@ get_obj_bool(cJSON *json, const char *name, bool *out_bool)
static bool
get_obj_int(cJSON *json, const char *name, int *out_int)
{
if (json == NULL) {
return false;
}
cJSON *item = get_obj(json, name);
if (item == NULL) {
return false;
@ -129,6 +135,9 @@ get_obj_int(cJSON *json, const char *name, int *out_int)
static bool
get_obj_float(cJSON *json, const char *name, float *out_float)
{
if (json == NULL) {
return false;
}
cJSON *item = get_obj(json, name);
if (item == NULL) {
return false;
@ -145,6 +154,9 @@ get_obj_float(cJSON *json, const char *name, float *out_float)
static bool
get_obj_str(cJSON *json, const char *name, char *array, size_t array_size)
{
if (json == NULL) {
return false;
}
cJSON *item = get_obj(json, name);
if (item == NULL) {
return false;
@ -318,7 +330,7 @@ u_config_json_get_tracking_overrides(struct u_config_json *json,
o->offset.orientation.w = 1;
}
char input_name[512];
char input_name[512] = {'\0'};
get_obj_str(override, "xrt_input_name", input_name, 512);
o->input_name = xrt_input_name_enum(input_name);