Commit 529b1455113 for php.net
commit 529b1455113ef8bed4968016069d3feae910db42
Merge: 63dcfb4eaa3 b8dad9314c1
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed May 6 13:11:01 2026 +0200
Merge branch 'PHP-8.5'
* PHP-8.5:
GHSA-m8rr-4c36-8gq4: Consistently pass unsigned char to ctype.h functions
diff --cc ext/standard/metaphone.c
index a79ca903ec9,887c4b1702f..8f33057de5a
--- a/ext/standard/metaphone.c
+++ b/ext/standard/metaphone.c
@@@ -105,9 -107,9 +105,9 @@@ static zend_always_inline char encode(c
/*----------------------------- */
/* I suppose I could have been using a character pointer instead of
- * accesssing the array directly... */
+ * accessing the array directly... */
- #define Convert_Raw(c) toupper(c)
+ #define Convert_Raw(c) toupper((unsigned char)c)
/* Look at the next letter in the word */
#define Read_Raw_Next_Letter (word[w_idx+1])
#define Read_Next_Letter (Convert_Raw(Read_Raw_Next_Letter))
diff --cc ext/standard/string.c
index 89b4e51e6c2,54ed10c525f..7ded14366a9
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@@ -5064,10 -5059,10 +5064,10 @@@ static bool php_tag_find(char *tag, siz
*(n++) = c;
break;
case '>':
- done =1;
+ done = true;
break;
default:
- if (!isspace((int)c)) {
+ if (!isspace((unsigned char)c)) {
if (state == 0) {
state=1;
}