From e6767d6e47ea254f69a51dcbb733f06264c77c2c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 8 Mar 2026 14:49:57 +0000 Subject: util/nvmutil: make xstrxcmp() easier to read Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'util/nvmutil') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 35504729..a876c5d4 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -1130,7 +1130,7 @@ xstrxcmp(const char *a, const char *b, size_t maxlen) { size_t i; - if (!a || !b) + if (a == NULL || b == NULL) err(EINVAL, "NULL input to xstrxcmp"); if (*a == '\0' || *b == '\0') @@ -1144,6 +1144,9 @@ xstrxcmp(const char *a, const char *b, size_t maxlen) return 0; } + /* + * We reached maxlen, so assume unterminated string. + */ err(EINVAL, "Unterminated string in xstrxcmp"); /* -- cgit v1.2.1