Change conditions' order; cast isdigit()'s argument

airween · airween · commit 9b33b2eb5d2b · 2026-04-19T16:03:40.000+02:00
diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc
@@ -362,7 +362,7 @@ int Multipart::parse_content_disposition(const char *c_d_value, int offset) {
             const char* start_of_filename = p;
             while ((*p != '\0') && (*p != ';')) {
                 if (*p == '%') {
-                    if ((*(p+1) == '\0') || (!isxdigit(*(p+1))) || (*(p+2) == '\0') || (!isxdigit(static_cast<unsigned char>(*(p+2))))) {
+                    if ((*(p+1) == '\0') || (*(p+2) == '\0') || (!isxdigit(static_cast<unsigned char>(*(p+1)))) || (!isxdigit(static_cast<unsigned char>(*(p+2))))) {
                         return -18;
                     }
                     p += 3;

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ int Multipart::parse_content_disposition(const char *c_d_value, int offset) {`
`362`	`362`	`const char* start_of_filename = p;`
`363`	`363`	`while ((p != '\0') && (p != ';')) {`
`364`	`364`	`if (*p == '%') {`
`365`		`- if (((p+1) == '\0') \|\| (!isxdigit((p+1))) \|\| ((p+2) == '\0') \|\| (!isxdigit(static_cast<unsigned char>((p+2))))) {`
	`365`	`+ if (((p+1) == '\0') \|\| ((p+2) == '\0') \|\| (!isxdigit(static_cast<unsigned char>((p+1)))) \|\| (!isxdigit(static_cast<unsigned char>((p+2))))) {`
`366`	`366`	`return -18;`
`367`	`367`	`}`
`368`	`368`	`p += 3;`