diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-01-20 06:37:12 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-01-20 06:54:53 +0100 |
| commit | 86d82cb8885afaac374225b945b2efc2a013cb7e (patch) | |
| tree | b4682dea82559cfbdfc820f93d1808498ad218ba /src/libsystemd-network/test-ndisc-rs.c | |
| parent | Merge pull request #26105 from yuwata/network-config-parse-address-make-prefi... (diff) | |
| download | systemd-86d82cb8885afaac374225b945b2efc2a013cb7e.tar.xz systemd-86d82cb8885afaac374225b945b2efc2a013cb7e.zip | |
test-ndisc: fix memleak and fd leak
Fixes issues reported at #22576.
Diffstat (limited to 'src/libsystemd-network/test-ndisc-rs.c')
| -rw-r--r-- | src/libsystemd-network/test-ndisc-rs.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index 3c679f60b5..e501b64377 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -10,6 +10,7 @@ #include "sd-ndisc.h" #include "alloc-util.h" +#include "fd-util.h" #include "hexdecoct.h" #include "icmp6-util.h" #include "socket-util.h" @@ -255,8 +256,8 @@ static void test_callback(sd_ndisc *nd, sd_ndisc_event_t event, sd_ndisc_router } TEST(rs) { - sd_event *e; - sd_ndisc *nd; + _cleanup_(sd_event_unrefp) sd_event *e = NULL; + _cleanup_(sd_ndisc_unrefp) sd_ndisc *nd = NULL; send_ra_function = send_ra; @@ -279,17 +280,13 @@ TEST(rs) { assert_se(sd_ndisc_start(nd) >= 0); assert_se(sd_ndisc_start(nd) >= 0); assert_se(sd_ndisc_stop(nd) >= 0); + test_fd[1] = safe_close(test_fd[1]); assert_se(sd_ndisc_start(nd) >= 0); assert_se(sd_event_loop(e) >= 0); - nd = sd_ndisc_unref(nd); - assert_se(!nd); - - close(test_fd[1]); - - sd_event_unref(e); + test_fd[1] = safe_close(test_fd[1]); } static int test_timeout_value(uint8_t flags) { @@ -342,8 +339,8 @@ static int test_timeout_value(uint8_t flags) { } TEST(timeout) { - sd_event *e; - sd_ndisc *nd; + _cleanup_(sd_event_unrefp) sd_event *e = NULL; + _cleanup_(sd_ndisc_unrefp) sd_ndisc *nd = NULL; send_ra_function = test_timeout_value; @@ -367,9 +364,7 @@ TEST(timeout) { assert_se(sd_event_loop(e) >= 0); - nd = sd_ndisc_unref(nd); - - sd_event_unref(e); + test_fd[1] = safe_close(test_fd[1]); } DEFINE_TEST_MAIN(LOG_DEBUG); |