diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-04-09 07:34:49 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-04-09 07:34:49 +0800 |
| commit | 2aba2494f5e9458760c8246ad1928074984a2766 (patch) | |
| tree | 58f333d58a0d6cc8c03acfc592b5a6cbcf0916ab | |
| parent | 002c8e835691a5db26baf10fac9178e91afded10 (diff) | |
| parent | 032921d80cd97d1d8a696348ce6bb0fd17e597e8 (diff) | |
| download | php-git-2aba2494f5e9458760c8246ad1928074984a2766.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/standard/string.c | 17 | ||||
| -rw-r--r-- | ext/standard/tests/strings/substr_compare.phpt | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index eafa6cf2a0..9139906653 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5585,14 +5585,19 @@ PHP_FUNCTION(substr_compare) int s1_len, s2_len; long offset, len=0; zend_bool cs=0; + uint cmp_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl|lb", &s1, &s1_len, &s2, &s2_len, &offset, &len, &cs) == FAILURE) { RETURN_FALSE; } - if (ZEND_NUM_ARGS() >= 4 && len < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than or equal to zero"); - RETURN_FALSE; + if (ZEND_NUM_ARGS() >= 4 && len <= 0) { + if (len == 0) { + RETURN_LONG(0L); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length must be greater than or equal to zero"); + RETURN_FALSE; + } } if (offset < 0) { @@ -5605,10 +5610,12 @@ PHP_FUNCTION(substr_compare) RETURN_FALSE; } + cmp_len = (uint) (len ? len : MAX(s2_len, (s1_len - offset))); + if (!cs) { - RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len)); + RETURN_LONG(zend_binary_strncmp(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len)); } else { - RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, (uint)len)); + RETURN_LONG(zend_binary_strncasecmp_l(s1 + offset, (s1_len - offset), s2, s2_len, cmp_len)); } } /* }}} */ diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt index 84777711e6..191a77e098 100644 --- a/ext/standard/tests/strings/substr_compare.phpt +++ b/ext/standard/tests/strings/substr_compare.phpt @@ -3,6 +3,7 @@ substr_compare() --FILE-- <?php +var_dump(substr_compare("abcde", "df", -2)); var_dump(substr_compare("abcde", "bc", 1, 2)); var_dump(substr_compare("abcde", "bcg", 1, 2)); var_dump(substr_compare("abcde", "BC", 1, 2, true)); @@ -20,6 +21,7 @@ var_dump(substr_compare("abcde", -1, 0, "str", new stdClass)); echo "Done\n"; ?> --EXPECTF-- +int(-1) int(0) int(0) int(0) |