clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source
This commit is contained in:
Nikita Popov 2016-08-07 18:50:34 +02:00
commit 61fb4f40aa
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/standard/string.c
View File

@ -5717,14 +5717,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 {

14
ext/standard/tests/strings/bug55451.phpt Normal file
View File

@ -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
ext/standard/tests/strings/substr_compare.phpt
View File

@ -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)