From bb3ff7a9967db904c83f4f7be033f4d29ace4222 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 31 Mar 2022 11:01:52 +0200
Subject: [PATCH] veritysetup: mangle option strings like in cryptsetup

---
 src/veritysetup/veritysetup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 5fc74f1c31f..3551ed4f3a6 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -144,7 +144,7 @@ static int run(int argc, char *argv[]) {
                 data_device = argv[3];
                 verity_device = argv[4];
                 root_hash = argv[5];
-                options = argv[6];
+                options = mangle_none(argc > 6 ? argv[6] : NULL);
 
                 r = unhexmem(root_hash, SIZE_MAX, &m, &l);
                 if (r < 0)
@@ -162,7 +162,7 @@ static int run(int argc, char *argv[]) {
                         return 0;
                 }
 
-                if (argc > 6) {
+                if (options) {
                         r = parse_options(options);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to parse options: %m");
-- 
2.47.3