summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomspiderlabs <128755403+tomspiderlabs@users.noreply.github.com>2023-03-23 23:39:38 +0000
committerSerge Hallyn <serge@hallyn.com>2023-03-30 19:23:00 -0500
commite5905c4b84d4fb90aefcd96ee618411ebfac663d (patch)
tree74a4b3ad77f7610c006426834d7dcacb13115bbc
parentbd2d0079c90241f24671a7946a3ad175dc1a3aeb (diff)
Added control character check
Added control character check, returning -1 (to "err") if control characters are present.
-rw-r--r--lib/fields.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/fields.c b/lib/fields.c
index 640be931..fb51b582 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -21,9 +21,9 @@
*
* The supplied field is scanned for non-printable and other illegal
* characters.
- * + -1 is returned if an illegal character is present.
- * + 1 is returned if no illegal characters are present, but the field
- * contains a non-printable character.
+ * + -1 is returned if an illegal or control character is present.
+ * + 1 is returned if no illegal or control characters are present,
+ * but the field contains a non-printable character.
* + 0 is returned otherwise.
*/
int valid_field (const char *field, const char *illegal)
@@ -45,10 +45,13 @@ int valid_field (const char *field, const char *illegal)
}
if (0 == err) {
- /* Search if there are some non-printable characters */
+ /* Search if there are non-printable or control characters */
for (cp = field; '\0' != *cp; cp++) {
if (!isprint (*cp)) {
err = 1;
+ }
+ if (!iscntrl (*cp)) {
+ err = -1;
break;
}
}