Skip to content

substr_compare: Ignore length parameter if NULL #2052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

substr_compare: Ignore length parameter if NULL #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5700,14 +5700,15 @@ PHP_FUNCTION(substr_compare)
{
zend_string *s1, *s2;
zend_long offset, len=0;
zend_bool len_is_default=1;
zend_bool cs=0;
size_t cmp_len;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl|lb", &s1, &s2, &offset, &len, &cs) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl|l!b", &s1, &s2, &offset, &len, &len_is_default, &cs) == FAILURE) {
RETURN_FALSE;
}

if (ZEND_NUM_ARGS() >= 4 && len <= 0) {
if (!len_is_default && len <= 0) {
if (len == 0) {
RETURN_LONG(0L);
} else {
Expand Down
14 changes: 14 additions & 0 deletions ext/standard/tests/strings/bug55451.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Bug #55451 (substr_compare with NULL as default length)
--FILE--
<?php
var_dump(substr_compare("abcde", "ABCD", 0, NULL, false) != 0);
var_dump(substr_compare("abcde", "ABCD", 0, NULL, true) != 0);
var_dump(substr_compare("abcde", "ABCDE", 0, NULL, false) != 0);
var_dump(substr_compare("abcde", "ABCDE", 0, NULL, true) == 0);
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(true)
2 changes: 1 addition & 1 deletion ext/standard/tests/strings/substr_compare.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Test

Warning: substr_compare(): The length must be greater than or equal to zero in %s on line %d
bool(false)
int(0)
int(4)

Warning: substr_compare() expects parameter 4 to be integer, string given in %s on line %d
bool(false)
Expand Down