summaryrefslogtreecommitdiff
path: root/src/partition/makefs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/partition/makefs.c')
-rw-r--r--src/partition/makefs.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index 951989cbb6..d73d67c4e8 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -41,8 +41,7 @@ static int makefs(const char *type, const char *device) {
}
static int run(int argc, char *argv[]) {
- const char *device, *type;
- _cleanup_free_ char *detected = NULL;
+ _cleanup_free_ char *device = NULL, *type = NULL, *detected = NULL;
struct stat st;
int r;
@@ -52,8 +51,14 @@ static int run(int argc, char *argv[]) {
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"This program expects two arguments.");
- type = argv[1];
- device = argv[2];
+ /* type and device must be copied because makefs calls safe_fork, which clears argv[] */
+ type = strdup(argv[1]);
+ if (!type)
+ return -ENOMEM;
+
+ device = strdup(argv[2]);
+ if (!device)
+ return -ENOMEM;
if (stat(device, &st) < 0)
return log_error_errno(errno, "Failed to stat \"%s\": %m", device);