|
 |
8d419f |
From d947339b49eb7935ce282e808a7e75a6098d088a Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8d419f |
Date: Tue, 22 Feb 2022 21:11:51 +0900
|
|
|
8d419f |
Subject: [PATCH] test: fix file descriptor leak in test-catalog
|
|
|
8d419f |
|
|
|
8d419f |
Fixes an issue reported in #22576.
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 62d4b3b36e9aba9e605ba042a75c374155b6e18b)
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
src/libsystemd/sd-journal/test-catalog.c | 3 ++-
|
|
|
8d419f |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/src/libsystemd/sd-journal/test-catalog.c b/src/libsystemd/sd-journal/test-catalog.c
|
|
|
8d419f |
index 316c3b1634..ad06221175 100644
|
|
|
8d419f |
--- a/src/libsystemd/sd-journal/test-catalog.c
|
|
|
8d419f |
+++ b/src/libsystemd/sd-journal/test-catalog.c
|
|
|
8d419f |
@@ -196,6 +196,7 @@ static void test_catalog_file_lang(void) {
|
|
|
8d419f |
|
|
|
8d419f |
int main(int argc, char *argv[]) {
|
|
|
8d419f |
_cleanup_(unlink_tempfilep) char database[] = "/tmp/test-catalog.XXXXXX";
|
|
|
8d419f |
+ _cleanup_close_ int fd = -1;
|
|
|
8d419f |
_cleanup_free_ char *text = NULL;
|
|
|
8d419f |
int r;
|
|
|
8d419f |
|
|
|
8d419f |
@@ -218,7 +219,7 @@ int main(int argc, char *argv[]) {
|
|
|
8d419f |
test_catalog_import_merge();
|
|
|
8d419f |
test_catalog_import_merge_no_body();
|
|
|
8d419f |
|
|
|
8d419f |
- assert_se(mkostemp_safe(database) >= 0);
|
|
|
8d419f |
+ assert_se((fd = mkostemp_safe(database)) >= 0);
|
|
|
8d419f |
|
|
|
8d419f |
test_catalog_update(database);
|
|
|
8d419f |
|