|
 |
8d419f |
From 3ca37c58cb3ff022e029b28539fd2e3b208802fd Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8d419f |
Date: Tue, 22 Feb 2022 21:42:22 +0900
|
|
|
8d419f |
Subject: [PATCH] test: fix file descriptor leak in test-fs-util
|
|
|
8d419f |
|
|
|
8d419f |
Fixes an issue reported in #22576.
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 19962747ca86a25e7102c536380bb2e9d7cfee9a)
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
src/test/test-fs-util.c | 5 ++++-
|
|
|
8d419f |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
|
|
|
8d419f |
index 602ce75f98..f53a3ebf59 100644
|
|
|
8d419f |
--- a/src/test/test-fs-util.c
|
|
|
8d419f |
+++ b/src/test/test-fs-util.c
|
|
|
8d419f |
@@ -29,10 +29,11 @@ static const char *arg_test_dir = NULL;
|
|
|
8d419f |
|
|
|
8d419f |
TEST(chase_symlinks) {
|
|
|
8d419f |
_cleanup_free_ char *result = NULL;
|
|
|
8d419f |
+ _cleanup_close_ int pfd = -1;
|
|
|
8d419f |
char *temp;
|
|
|
8d419f |
const char *top, *p, *pslash, *q, *qslash;
|
|
|
8d419f |
struct stat st;
|
|
|
8d419f |
- int r, pfd;
|
|
|
8d419f |
+ int r;
|
|
|
8d419f |
|
|
|
8d419f |
temp = strjoina(arg_test_dir ?: "/tmp", "/test-chase.XXXXXX");
|
|
|
8d419f |
assert_se(mkdtemp(temp));
|
|
|
8d419f |
@@ -318,6 +319,7 @@ TEST(chase_symlinks) {
|
|
|
8d419f |
assert_se(fstat(pfd, &st) >= 0);
|
|
|
8d419f |
assert_se(S_ISLNK(st.st_mode));
|
|
|
8d419f |
result = mfree(result);
|
|
|
8d419f |
+ pfd = safe_close(pfd);
|
|
|
8d419f |
|
|
|
8d419f |
/* s1 -> s2 -> nonexistent */
|
|
|
8d419f |
q = strjoina(temp, "/s1");
|
|
|
8d419f |
@@ -331,6 +333,7 @@ TEST(chase_symlinks) {
|
|
|
8d419f |
assert_se(fstat(pfd, &st) >= 0);
|
|
|
8d419f |
assert_se(S_ISLNK(st.st_mode));
|
|
|
8d419f |
result = mfree(result);
|
|
|
8d419f |
+ pfd = safe_close(pfd);
|
|
|
8d419f |
|
|
|
8d419f |
/* Test CHASE_STEP */
|
|
|
8d419f |
|