]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
add check load config
authorBastian Dehn <hhaalo@arcor.de>
Fri, 29 Mar 2024 15:23:16 +0000 (16:23 +0100)
committerBastian Dehn <hhaalo@arcor.de>
Fri, 29 Mar 2024 15:23:16 +0000 (16:23 +0100)
src/kds_s2000w_client.c
src/kds_s2000w_config.c

index e63fa256fad7bcd8da6bd58d8073bda555dceadb..d4ee876091ba94334347bb6b767f43aa93c70530 100644 (file)
@@ -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;
 
index 2341a3250dae071959b9fd29df0e3e6868fb8326..d50b081003f865f4ebea8a7c41bdc5d185f79ada 100644 (file)
@@ -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++;