From 8b3e9c340069fbfc3c9696d028b42c97e05bb035 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Tue, 3 Jun 2025 09:10:57 +0200 Subject: [PATCH] lib/fields.*: valid_field: Make sure that $2 is a string literal and thus, nonnull. Suggested-by: Serge Hallyn Signed-off-by: Alejandro Colomar --- lib/fields.c | 3 ++- lib/fields.h | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 -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); -- 2.47.2