From a678bc69f943431ade55238c919dcc6dfe60f811 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 2 Apr 2026 14:13:13 +0200 Subject: [PATCH] iso9660: small iso9660_set_string() clean-ups --- src/repart/iso9660.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/repart/iso9660.c b/src/repart/iso9660.c index 72d4c285cb..a555fb9f9e 100644 --- a/src/repart/iso9660.c +++ b/src/repart/iso9660.c @@ -120,15 +120,17 @@ static bool iso9660_valid_string(const char *str, bool allow_a_chars) { } int iso9660_set_string(char target[], size_t len, const char *source, bool allow_a_chars) { - if (source && !iso9660_valid_string(source, allow_a_chars)) - return -EINVAL; + assert(target || len == 0); if (source) { + if (!iso9660_valid_string(source, allow_a_chars)) + return -EINVAL; + size_t slen = strlen(source); if (slen > len) return -EINVAL; - void *p = mempcpy(target, source, slen); - memset(p, ' ', len - slen); + + memset(mempcpy(target, source, slen), ' ', len - slen); } else memset(target, ' ', len);