From c9b733265f5c0ead8a5fcb5ea44438cc4f6ffccc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 21 Jan 2023 15:03:45 +0900 Subject: [PATCH 1/2] test-load-fragment: fix memleak Fixes a leak reported at https://github.com/systemd/systemd/pull/26115#issuecomment-1398026085. --- src/test/test-load-fragment.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 4464373132..288593e603 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -1047,6 +1047,8 @@ TEST(config_parse_log_filter_patterns) { SET_FOREACH(p, c.log_filter_denied_patterns) assert_se(p && p[0] != '~'); } + + exec_context_done(&c); } TEST(config_parse_open_file) { From 93d0cf7a3761c0bf24424a7653e637fb2d0523de Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 21 Jan 2023 15:08:04 +0900 Subject: [PATCH 2/2] test-load-fragment: shorten code a bit --- src/test/test-load-fragment.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 288593e603..f22fa42ce3 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -1008,7 +1008,6 @@ TEST(unit_is_recursive_template_dependency) { TEST(config_parse_log_filter_patterns) { ExecContext c = {}; - int r; static const struct { const char *regex; @@ -1033,9 +1032,8 @@ TEST(config_parse_log_filter_patterns) { return (void) log_tests_skipped("PCRE2 support is not available"); for (size_t i = 0; i < ELEMENTSOF(regex_tests); i++) { - r = config_parse_log_filter_patterns(NULL, "fake", 1, "section", 1, "LogFilterPatterns", 1, - regex_tests[i].regex, &c, NULL); - assert_se(r >= 0); + assert_se(config_parse_log_filter_patterns(NULL, "fake", 1, "section", 1, "LogFilterPatterns", 1, + regex_tests[i].regex, &c, NULL) >= 0); assert_se(set_size(c.log_filter_allowed_patterns) == regex_tests[i].allowed_patterns_count); assert_se(set_size(c.log_filter_denied_patterns) == regex_tests[i].denied_patterns_count);