dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

tree-wide: do not use "re" with fmemopen

Browse Source 
The man page says nothing about "e". Glibc clearly accepts it without fuss, but
it is meaningless for a memory object (and probably doesn't work). This use is
not portable, so let's avoid it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-10-19 09:49:59 +02:00
parent dc1768131a
commit f3bd4b3df5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fuzz/fuzz.h
View File

@@ -14,7 +14,7 @@ static inline FILE* data_to_file(const uint8_t *data, size_t size) {
if (size == 0)
return fopen("/dev/null", "re");
else
return fmemopen_unlocked((char*) data, size, "re");
return fmemopen_unlocked((char*) data, size, "r");
}
/* Check if we are within the specified size range.

4
src/portable/portablectl.c
View File

@@ -344,7 +344,7 @@ static int inspect_image(int argc, char *argv[], void *userdata) {
_cleanup_free_ char *pretty_portable = NULL, *pretty_os = NULL;
_cleanup_fclose_ FILE *f = NULL;
f = fmemopen_unlocked((void*) data, sz, "re");
f = fmemopen_unlocked((void*) data, sz, "r");
if (!f)
return log_error_errno(errno, "Failed to open /etc/os-release buffer: %m");
@@ -400,7 +400,7 @@ static int inspect_image(int argc, char *argv[], void *userdata) {
*id = NULL, *version_id = NULL, *sysext_scope = NULL, *portable_prefixes = NULL;
_cleanup_fclose_ FILE *f = NULL;
f = fmemopen_unlocked((void*) data, sz, "re");
f = fmemopen_unlocked((void*) data, sz, "r");
if (!f)
return log_error_errno(errno, "Failed to open extension-release buffer: %m");

4
src/test/test-fileio.c
View File

@@ -677,7 +677,7 @@ TEST(fgetc) {
_cleanup_fclose_ FILE *f = NULL;
char c;
assert_se(f = fmemopen_unlocked((void*) chars, sizeof(chars), "re"));
assert_se(f = fmemopen_unlocked((void*) chars, sizeof(chars), "r"));
for (size_t i = 0; i < sizeof(chars); i++) {
assert_se(safe_fgetc(f, &c) == 1);
@@ -770,7 +770,7 @@ static void test_read_line_one_file(FILE *f) {
TEST(read_line1) {
_cleanup_fclose_ FILE *f = NULL;
assert_se(f = fmemopen_unlocked((void*) buffer, sizeof(buffer), "re"));
assert_se(f = fmemopen_unlocked((void*) buffer, sizeof(buffer), "r"));
test_read_line_one_file(f);
}

2
src/test/test-libmount.c
View File

@@ -21,7 +21,7 @@ static void test_libmount_unescaping_one(
_cleanup_(mnt_free_iterp) struct libmnt_iter *iter = NULL;
_cleanup_fclose_ FILE *f = NULL;
f = fmemopen((char*) string, strlen(string), "re");
f = fmemopen((char*) string, strlen(string), "r");
assert_se(f);
assert_se(libmount_parse(title, f, &table, &iter) >= 0);