ctype: exclude control bytes from ISPRINT and ISGRAPH

Closes #22371

diff --git a/lib/curl_ctype.h b/lib/curl_ctype.h
index f3291ad8184b61f5e5247cadd628d59dc80ced6e..fd6b7d723cf5a8fbf9eabb1a8f66d0a6a4f5dd53 100644 (file)
--- a/lib/curl_ctype.h
+++ b/lib/curl_ctype.h
@@ -30,10 +30,8 @@
 #define ISLOWCNTRL(x) ((unsigned char)(x) <= 0x1f)
 #define IS7F(x)       ((x) == 0x7f)
 
-#define ISLOWPRINT(x) (((x) >= 9) && ((x) <= 0x0d))
-
-#define ISPRINT(x)  (ISLOWPRINT(x) || (((x) >= ' ') && ((x) <= 0x7e)))
-#define ISGRAPH(x)  (ISLOWPRINT(x) || (((x) > ' ') && ((x) <= 0x7e)))
+#define ISPRINT(x)  (((x) >= ' ') && ((x) <= 0x7e))
+#define ISGRAPH(x)  (((x) > ' ') && ((x) <= 0x7e))
 #define ISCNTRL(x)  (ISLOWCNTRL(x) || IS7F(x))
 #define ISALPHA(x)  (ISLOWER(x) || ISUPPER(x))
 #define ISXDIGIT(x) (ISDIGIT(x) || ISLOWHEXALPHA(x) || ISUPHEXALPHA(x))

diff --git a/tests/unit/unit1307.c b/tests/unit/unit1307.c
index 833319b611ec936f5ed2e15eda096bc026c6d148..c45dc81c770e1a482e0b2408c85b0735532f83ca 100644 (file)
--- a/tests/unit/unit1307.c
+++ b/tests/unit/unit1307.c
@@ -174,10 +174,15 @@ static CURLcode test_unit1307(const char *arg)
     { "[[:print:]]",              "L",                      MATCH },
     { "[[:print:]]",              "\10",                    NOMATCH },
     { "[[:print:]]",              "\10",                    NOMATCH },
+    { "[[:print:]]",              "\t",                     NOMATCH },
+    { "[[:print:]]",              "\n",                     NOMATCH },
+    { "[[:print:]]",              "\r",                     NOMATCH },
     { "[[:space:]]",              " ",                      MATCH },
     { "[[:space:]]",              "x",                      NOMATCH },
     { "[[:graph:]]",              " ",                      NOMATCH },
     { "[[:graph:]]",              "x",                      MATCH },
+    { "[[:graph:]]",              "\t",                     NOMATCH },
+    { "[[:graph:]]",              "\r",                     NOMATCH },
     { "[[:blank:]]",              "\t",                     MATCH },
     { "[[:blank:]]",              " ",                      MATCH },
     { "[[:blank:]]",              "\r",                     NOMATCH },