linked-list: Don't require an argument for the item when enumerating

diff --git a/src/libstrongswan/collections/linked_list.c b/src/libstrongswan/collections/linked_list.c
index 274ad8e5b057255cb5667a6c3467785b3ca33e4d..dbbc2a98d867549c68ff82cb6ddae9a86d8ada9b 100644 (file)
--- a/src/libstrongswan/collections/linked_list.c
+++ b/src/libstrongswan/collections/linked_list.c
@@ -138,7 +138,10 @@ METHOD(enumerator_t, enumerate, bool,
                this->finished = TRUE;
                return FALSE;
        }
-       *item = this->current->value;
+       if (item)
+       {
+               *item = this->current->value;
+       }
        return TRUE;
 }
 

diff --git a/src/libstrongswan/tests/test_linked_list_enumerator.c b/src/libstrongswan/tests/test_linked_list_enumerator.c
index 840e384c94d4437b3987bf3a770314011e138116..93d814b2c76fbd92ed22289bd91168e230c7b535 100644 (file)
--- a/src/libstrongswan/tests/test_linked_list_enumerator.c
+++ b/src/libstrongswan/tests/test_linked_list_enumerator.c
@@ -59,6 +59,22 @@ START_TEST(test_enumerate)
 }
 END_TEST
 
+START_TEST(test_enumerate_null)
+{
+       enumerator_t *enumerator;
+       int round;
+
+       round = 1;
+       enumerator = list->create_enumerator(list);
+       while (enumerator->enumerate(enumerator, NULL))
+       {
+               round++;
+       }
+       ck_assert_int_eq(round, 6);
+       enumerator->destroy(enumerator);
+}
+END_TEST
+
 START_TEST(test_reset_enumerator)
 {
        enumerator_t *enumerator;
@@ -364,6 +380,7 @@ Suite *linked_list_enumerator_suite_create()
        tc = tcase_create("enumerate");
        tcase_add_checked_fixture(tc, setup_list, teardown_list);
        tcase_add_test(tc, test_enumerate);
+       tcase_add_test(tc, test_enumerate_null);
        tcase_add_test(tc, test_reset_enumerator);
        tcase_add_test(tc, test_has_more_empty);
        tcase_add_test(tc, test_has_more);