mirror of
https://github.com/systemd/systemd.git
synced 2025-03-21 02:50:18 +03:00
test-fileio: use random name for written file
If two instances of test-fileio were run in parallel, they could fail when trying to write the same file. This predictable name in /tmp/ wasn't actually a security issue, because write_env_file would not follow symlinks, so this could be an issue only when running tests in parallel.
This commit is contained in:
parent
e861b62154
commit
095b30cbf9
@ -29,7 +29,8 @@
|
||||
#include "env-util.h"
|
||||
|
||||
static void test_parse_env_file(void) {
|
||||
char t[] = "/tmp/test-parse-env-file-XXXXXX";
|
||||
char t[] = "/tmp/test-fileio-in-XXXXXX",
|
||||
p[] = "/tmp/test-fileio-out-XXXXXX";
|
||||
int fd, r;
|
||||
FILE *f;
|
||||
_cleanup_free_ char *one = NULL, *two = NULL, *three = NULL, *four = NULL, *five = NULL,
|
||||
@ -38,6 +39,8 @@ static void test_parse_env_file(void) {
|
||||
char **i;
|
||||
unsigned k;
|
||||
|
||||
assert_se(mktemp(p));
|
||||
|
||||
fd = mkostemp(t, O_CLOEXEC);
|
||||
assert_se(fd >= 0);
|
||||
|
||||
@ -83,7 +86,7 @@ static void test_parse_env_file(void) {
|
||||
assert_se(streq(a[9], "ten="));
|
||||
assert_se(a[10] == NULL);
|
||||
|
||||
strv_env_clean_log(a, "/tmp/test-fileio");
|
||||
strv_env_clean_log(a, "test");
|
||||
|
||||
k = 0;
|
||||
STRV_FOREACH(i, b) {
|
||||
@ -129,14 +132,14 @@ static void test_parse_env_file(void) {
|
||||
assert_se(streq(nine, "nineval"));
|
||||
assert_se(ten == NULL);
|
||||
|
||||
r = write_env_file("/tmp/test-fileio", a);
|
||||
r = write_env_file(p, a);
|
||||
assert_se(r >= 0);
|
||||
|
||||
r = load_env_file("/tmp/test-fileio", NULL, &b);
|
||||
r = load_env_file(p, NULL, &b);
|
||||
assert_se(r >= 0);
|
||||
|
||||
unlink(t);
|
||||
unlink("/tmp/test-fileio");
|
||||
unlink(p);
|
||||
}
|
||||
|
||||
static void test_executable_is_script(void) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user