diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-14 12:42:46 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-14 12:42:46 +0200 |
| commit | 162776a1328030aaa556ac613a671fd533dab4b7 (patch) | |
| tree | e1b9fd327fc4df2ce729e19b6a161175cbd9bbe9 | |
| parent | 7a39e174aa82ffef67ae24dc7952c62225477c5d (diff) | |
| parent | ce149b0cb8ce8983eae3885dd42e9ccbdc650d6e (diff) | |
| download | php-git-162776a1328030aaa556ac613a671fd533dab4b7.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79849
| -rw-r--r-- | ext/standard/string.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index ff9f2a849d..76383dc4ee 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2807,8 +2807,9 @@ PHP_FUNCTION(chr) Uppercase the first character of the word in a native string */ static zend_string* php_ucfirst(zend_string *str) { - unsigned char r = toupper(ZSTR_VAL(str)[0]); - if (r == ZSTR_VAL(str)[0]) { + const unsigned char ch = ZSTR_VAL(str)[0]; + unsigned char r = toupper(ch); + if (r == ch) { return zend_string_copy(str); } else { zend_string *s = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 0); |