test init option descriptor for no mem

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 909d3c9aa5f8d7e8105139c73ceb44113ed0d1fd..c95a27ee8efc1e0b9625369dcedaf3ad290e4c64 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1534,6 +1534,7 @@ SANE_Status _kds_s2000w_option_descriptors_init_min_profile()
                        descriptors = NULL;
                        return SANE_STATUS_NO_MEM;
                }
+               descriptors[i]->descriptor = NULL;
        }
 
        descriptors[0]->config_name = OPTION_COUNT;
@@ -1583,6 +1584,7 @@ SANE_Status _kds_s2000w_option_descriptors_init_230802_v1_0_36_profile()
                        descriptors = NULL;
                        return SANE_STATUS_NO_MEM;
                }
+               descriptors[i]->descriptor = NULL;
        }
 
        descriptors[0]->config_name = OPTION_COUNT;
@@ -1660,6 +1662,7 @@ SANE_Status _kds_s2000w_option_descriptors_init_full_profile()
                        descriptors = NULL;
                        return SANE_STATUS_NO_MEM;
                }
+               descriptors[i]->descriptor = NULL;
        }
 
        descriptors[0]->config_name = OPTION_COUNT;

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 55d49547688b3658314ba032f795b80f9c7c7f21..1ef46847cf0f1de80d1cc8de18df117ec2a1273d 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -876,11 +876,13 @@ void Kds_s2000w_option_init_descriptor_no_mem()
 
        assert_int_equal(status, SANE_STATUS_NO_MEM);
 
-       status = 0;
-       set_no_mem_counter(1);
-       status = kds_s2000w_option_descriptors_init(PROFILE_FULL);
+       for (uint32_t i = 0; i < 127; i++) {
+               status = 0;
+               set_no_mem_counter(i + 1);
+               status = kds_s2000w_option_descriptors_init(PROFILE_FULL);
 
-       assert_int_equal(status, SANE_STATUS_NO_MEM);
+               assert_int_equal(status, SANE_STATUS_NO_MEM);
+       }
 }
 
 int main()