43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 40e43b290473aac1737f64b84194c5fc6b8210cf Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Tue, 22 Feb 2022 21:44:58 +0900
|
|
Subject: [PATCH] test: fix file descriptor leak in test-tmpfiles.c
|
|
|
|
Also fixes a typo in assertion.
|
|
|
|
Fixes an issure reported in #22576.
|
|
|
|
(cherry picked from commit 1da5325d19dee654326e5fa2f61262e5e0a40fff)
|
|
(cherry picked from commit d9189c31117e159f7bae9233863aa88a02159e14)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/40e43b290473aac1737f64b84194c5fc6b8210cf
|
|
---
|
|
src/test/test-tmpfiles.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
|
|
index 4c3389af8c..0ac2b7f599 100644
|
|
--- a/src/test/test-tmpfiles.c
|
|
+++ b/src/test/test-tmpfiles.c
|
|
@@ -37,7 +37,7 @@ int main(int argc, char** argv) {
|
|
assert_se(endswith(ans, " (deleted)"));
|
|
|
|
fd2 = mkostemp_safe(pattern);
|
|
- assert_se(fd >= 0);
|
|
+ assert_se(fd2 >= 0);
|
|
assert_se(unlink(pattern) == 0);
|
|
|
|
assert_se(asprintf(&cmd2, "ls -l /proc/"PID_FMT"/fd/%d", getpid_cached(), fd2) > 0);
|
|
@@ -49,6 +49,7 @@ int main(int argc, char** argv) {
|
|
pattern = strjoina(p, "/tmpfiles-test");
|
|
assert_se(tempfn_random(pattern, NULL, &d) >= 0);
|
|
|
|
+ fd = safe_close(fd);
|
|
fd = open_tmpfile_linkable(d, O_RDWR|O_CLOEXEC, &tmp);
|
|
assert_se(fd >= 0);
|
|
assert_se(write(fd, "foobar\n", 7) == 7);
|
|
--
|
|
2.33.0
|
|
|