diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-09 16:21:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-09 16:21:13 +0800 |
| commit | 9a2fc395425b9579d3989787e0982464beb29217 (patch) | |
| tree | ceb26873e83cd3c1e02701dd0159d846897db0dc | |
| parent | cfee682802a93540c3533d404a740efbccbf66c2 (diff) | |
| parent | 6da44fefb2065e28c6329f45b40c5611f86f4bf3 (diff) | |
| download | php-git-9a2fc395425b9579d3989787e0982464beb29217.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75781 (substr_count incorrect result)
| -rw-r--r-- | ext/standard/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 152906407d..dd7267b934 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5262,7 +5262,7 @@ PHP_FUNCTION(substr_count) char *haystack, *needle; zend_long offset = 0, length = 0; int ac = ZEND_NUM_ARGS(); - int count = 0; + zend_long count = 0; size_t haystack_len, needle_len; char *p, *endp, cmp; |