From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 3 Jun 2025 07:10:57 +0000 (+0200)
Subject: lib/fields.*: valid_field: Make sure that $2 is a string literal
X-Git-Tag: 4.18.0-rc1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b3e9c340069fbfc3c9696d028b42c97e05bb035;p=thirdparty%2Fshadow.git

lib/fields.*: valid_field: Make sure that $2 is a string literal

and thus, nonnull.

Suggested-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/fields.c b/lib/fields.c
index 06e741da1..d30ed698a 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -32,7 +32,8 @@
  *       but the field contains a non-printable character.
  *  +  0 is returned otherwise.
  */
-int valid_field (const char *field, const char *illegal)
+int
+valid_field_(const char *field, const char *illegal)
 {
 	const char *cp;
 	int err = 0;
diff --git a/lib/fields.h b/lib/fields.h
index 293d9bde3..6e5d61aac 100644
--- a/lib/fields.h
+++ b/lib/fields.h
@@ -10,7 +10,10 @@
 #include <stddef.h>
 
 
-int valid_field(const char *field, const char *illegal);
+#define valid_field(field, illegal)  valid_field_(field, "" illegal "")
+
+
+int valid_field_(const char *field, const char *illegal);
 void change_field(char *buf, size_t maxsize, const char *prompt);