From: Bastian Dehn Date: Fri, 29 Mar 2024 15:23:16 +0000 (+0100) Subject: add check load config X-Git-Tag: v1.0.0^2~44 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=f881293b547a395467172dc2f3f783faa1b357b8;p=sane-kds-s2000w-net.git add check load config --- diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index e63fa25..d4ee876 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -25,6 +25,9 @@ void _kds_s2000w_client_load_config() { const char* config_file = CONFIG_FILE; char* config_stream = read_config_file(config_file); + if (config_stream == NULL) + return; + load_config(&p_config, config_stream); } @@ -38,7 +41,6 @@ size_t _kds_s2000w_client_callback(char *ptr, size_t size, size_t nmemb, void *u data = (response*) userdata; fullsize = size * nmemb; new_data_ptr = realloc(data->data, data->size + fullsize + sizeof(char)); - if (!data->data) return 0; diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c index 2341a32..d50b081 100644 --- a/src/kds_s2000w_config.c +++ b/src/kds_s2000w_config.c @@ -12,6 +12,9 @@ char* read_config_file(const char* filename) config_file = fopen(filename, "r"); + if (config_file == NULL) + return NULL; + buf = malloc(sizeof(char)); while(fread(buf, sizeof(char), 1, config_file)) { char_count++;