php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Fix str_decrement() on "1"
This commit is contained in:
Ilija Tovilo
2023-10-02 16:42:16 +02:00
parent dab5aba45a b31a5b2731
commit 1df82938b2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/string.c
View File

@@ -1289,7 +1289,7 @@ PHP_FUNCTION(str_decrement)
}
} while (carry && position-- > 0);
if (UNEXPECTED(carry || ZSTR_VAL(decremented)[0] == '0')) {
if (UNEXPECTED(carry || (ZSTR_VAL(decremented)[0] == '0' && ZSTR_LEN(decremented) > 1))) {
if (ZSTR_LEN(decremented) == 1) {
zend_string_release_ex(decremented, /* persistent */ false);
zend_argument_value_error(1, "\"%s\" is out of decrement range", ZSTR_VAL(str));

3
ext/standard/tests/strings/str_decrement_basic.phpt
View File

@@ -28,6 +28,7 @@ $strictlyAlphaNumeric = [
"d",
"D",
"4",
"1",
];
foreach ($strictlyAlphaNumeric as $s) {
@@ -77,3 +78,5 @@ string(1) "C"
string(1) "D"
string(1) "3"
string(1) "4"
string(1) "0"
string(1) "1"