change test all descriptor mem leaks

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 999f66fe82bf1dea4f7857035c84db1f0ba8479a..f295bc8198a8b2f366e0fc5ae1ed7a8fbc71f89b 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1416,7 +1416,7 @@ SANE_Option_Descriptor *_kds_s2000w_option_descriptor_multifeed_response()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_multifeed_response");
 
-       char** constraint = malloc(sizeof(SANE_String_Const*) * 3);
+       const char** constraint = malloc(sizeof(SANE_String_Const*) * 3);
        if (constraint == NULL)
                return NULL;
 

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index d7ca90ea7f5b8f531e509718e2e5a1d1ccd38d5a..ba359c0e7128182e9b47f0b3cffc5a843b8bd54c 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -5,9 +5,9 @@
 #include "kds_s2000w_client_mock.h"
 
 extern void* __real_malloc(size_t size);
-int8_t mock_no_mem_counter = -1;
+int16_t mock_no_mem_counter = -1;
 
-void set_no_mem_counter(int8_t counter)
+void set_no_mem_counter(int16_t counter)
 {
        mock_no_mem_counter = counter;
 }

diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h
index aa91e4f18cd7f11947212cb607897b456c93a5aa..44dbf09e5dc0f5876237d03489ce690a1ce9d9cf 100644 (file)
--- a/tests/kds_s2000w_client_mock.h
+++ b/tests/kds_s2000w_client_mock.h
@@ -8,7 +8,7 @@
 #include "../src/kds_s2000w_client.h"
 #include "../src/kds_s2000w_image_converter.h"
 
-void set_no_mem_counter(int8_t counter);
+void set_no_mem_counter(int16_t counter);
 void* __wrap_malloc(size_t size);
 
 void mock_response(response_t* resp);

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 1ef46847cf0f1de80d1cc8de18df117ec2a1273d..00f7682d2faec48b16c7ecbcf7e58cdaab3a46ff 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -876,7 +876,7 @@ void Kds_s2000w_option_init_descriptor_no_mem()
 
        assert_int_equal(status, SANE_STATUS_NO_MEM);
 
-       for (uint32_t i = 0; i < 127; i++) {
+       for (uint32_t i = 0; i < 133; i++) {
                status = 0;
                set_no_mem_counter(i + 1);
                status = kds_s2000w_option_descriptors_init(PROFILE_FULL);