Retropex/datum_gateway
1
0
Fork 0
forked from Ocean/datum_gateway
Code Pull Requests Activity

Bugfix: conf: Handle null values correctly (as if they don't exist) and fail some invalid cases more gracefully

Browse Source
This commit is contained in:
Luke Dashjr 2024-12-13 19:01:49 +00:00
parent 7be012af2e
commit 14b31eb647
No known key found for this signature in database
GPG Key ID: A291A2C45D0C504A
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/datum_conf.c
View File

@ -262,7 +262,7 @@ int datum_read_config(const char *conffile) {
config = load_json_from_file(conffile); config = load_json_from_file(conffile);
if (!config) { if (!json_is_object(config)) {
DLOG_FATAL("Could not read configuration JSON file!"); DLOG_FATAL("Could not read configuration JSON file!");
return -1; return -1;
} }
@ -270,10 +270,10 @@ int datum_read_config(const char *conffile) {
for (i=0;i<NUM_CONFIG_ITEMS;i++) { for (i=0;i<NUM_CONFIG_ITEMS;i++) {
item = NULL; cat = NULL; item = NULL; cat = NULL;
cat = json_object_get(config, datum_config_options[i].category); cat = json_object_get(config, datum_config_options[i].category);
if (cat) { if (json_is_object(cat)) {
item = json_object_get(cat, datum_config_options[i].name); item = json_object_get(cat, datum_config_options[i].name);
} }
if ((!cat) || (!item)) { if ((!item) || json_is_null(item)) {
if (datum_config_options[i].required) { if (datum_config_options[i].required) {
DLOG_ERROR("Required configuration option (%s.%s) not found in config file:", datum_config_options[i].category, datum_config_options[i].name); DLOG_ERROR("Required configuration option (%s.%s) not found in config file:", datum_config_options[i].category, datum_config_options[i].name);
DLOG_ERROR("--- Config description: \"%s\"", datum_config_options[i].description); DLOG_ERROR("--- Config description: \"%s\"", datum_config_options[i].description);