Use the new toupper functions

tstarling · tstarling · commit 3275cb7956a3 · 2021-09-28T09:55:00.000+10:00
Use the new ASCII upper case functions in ext/xml, ext/pdo_dblib and as
an optimization for strtoupper() when the locale is "C".
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
@@ -438,7 +438,7 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *zv, enum pd
 						tmp_data_len = 36;
 						tmp_data = safe_emalloc(tmp_data_len, sizeof(char), 1);
 						data_len = dbconvert(NULL, SQLUNIQUE, data, data_len, SQLCHAR, (LPBYTE) tmp_data, tmp_data_len);
-						php_strtoupper(tmp_data, data_len);
+						zend_str_toupper(tmp_data, data_len);
 						ZVAL_STRINGL(zv, tmp_data, data_len);
 						efree(tmp_data);
 					} else {
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -1362,29 +1362,33 @@ PHPAPI zend_string *php_string_toupper(zend_string *s)
 	unsigned char *c;
 	const unsigned char *e;
 
-	c = (unsigned char *)ZSTR_VAL(s);
-	e = c + ZSTR_LEN(s);
+	if (EXPECTED(!BG(ctype_string))) {
+		return zend_string_toupper(s);
+	} else {
+		c = (unsigned char *)ZSTR_VAL(s);
+		e = c + ZSTR_LEN(s);
 
-	while (c < e) {
-		if (islower(*c)) {
-			unsigned char *r;
-			zend_string *res = zend_string_alloc(ZSTR_LEN(s), 0);
+		while (c < e) {
+			if (islower(*c)) {
+				unsigned char *r;
+				zend_string *res = zend_string_alloc(ZSTR_LEN(s), 0);
 
-			if (c != (unsigned char*)ZSTR_VAL(s)) {
-				memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
-			}
-			r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
-			while (c < e) {
-				*r = toupper(*c);
-				r++;
-				c++;
+				if (c != (unsigned char*)ZSTR_VAL(s)) {
+					memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
+				}
+				r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
+				while (c < e) {
+					*r = toupper(*c);
+					r++;
+					c++;
+				}
+				*r = '\0';
+				return res;
 			}
-			*r = '\0';
-			return res;
+			c++;
 		}
-		c++;
+		return zend_string_copy(s);
 	}
-	return zend_string_copy(s);
 }
 /* }}} */
 
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
@@ -611,7 +611,7 @@ static zend_string *_xml_decode_tag(xml_parser *parser, const char *tag)
 	str = xml_utf8_decode((const XML_Char *)tag, strlen(tag), parser->target_encoding);
 
 	if (parser->case_folding) {
-		php_strtoupper(ZSTR_VAL(str), ZSTR_LEN(str));
+		zend_str_toupper(ZSTR_VAL(str), ZSTR_LEN(str));
 	}
 
 	return str;

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ static zend_string _xml_decode_tag(xml_parser parser, const char *tag)`
`611`	`611`	`str = xml_utf8_decode((const XML_Char *)tag, strlen(tag), parser->target_encoding);`
`612`	`612`
`613`	`613`	`if (parser->case_folding) {`
`614`		`- php_strtoupper(ZSTR_VAL(str), ZSTR_LEN(str));`
	`614`	`+ zend_str_toupper(ZSTR_VAL(str), ZSTR_LEN(str));`
`615`	`615`	`}`
`616`	`616`
`617`	`617`	`return str;`