fix memory leak config load

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index bb61fd8ed9e99b2c0ba8453770e04e7dd617f737..8641ce504dd442b8b9d174576287d968b121155f 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -40,13 +40,15 @@ void _kds_s2000w_client_read_error_status(CURL* curl, response* resp)
 
 void _kds_s2000w_client_load_config()
 {
-       const char* config_file = CONFIG_FILE;
-       char* config_stream = read_config_file(config_file);
+       char* config_stream = read_config_file(CONFIG_FILE);
 
        if (config_stream == NULL)
                return;
 
        load_config(&p_config, config_stream);
+
+       free(config_stream);
+       config_stream = NULL;
 }
 
 void _kds_s2000w_client_stream_to_response(FILE* stream, response* resp, size_t* size)

diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c
index 8850a90b9cfa383a9a1f8153f52ccdb60a36e5a5..97c90fd585adfaf285425da5b7461f39b45e47c5 100644 (file)
--- a/src/kds_s2000w_config.c
+++ b/src/kds_s2000w_config.c
@@ -39,6 +39,7 @@ void load_config(program_config* config, const char* config_stream)
        config->scanner_url = NULL;
        config->username = NULL;
        config->heartbeat = 1;
+       config->ssl_verify = 0;
 
        cfg_t* cfg = NULL;
        char* value_str = NULL;

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 682ea3b68f7829dc9825ec24d22ab31a20a7bdca..505cb1c5149998bd1bac1d2330818a99afe9456b 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -11,11 +11,7 @@
 
 void __wrap_load_config(program_config* config, const char* config_stream)
 {
-       config->scanner_url = malloc(sizeof(char) * 28);
-       config->username = malloc(sizeof(char) * 4);
-
-       config->scanner_url = "https://scanner.example.com\0";
-       config->username = "Max\0";
+       return;
 }
 
 void __wrap_wait_a_second()
@@ -82,7 +78,6 @@ void kds_s2000w_net_get_select_fd()
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
 
-
 void sane_kds_s2000w_net_start_cancel()
 {
        handler* h = init_handler();