diff options
| author | Anatol Belski <ab@php.net> | 2016-06-22 19:10:57 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-22 19:10:57 +0200 |
| commit | d20372cf6cbb5a3e44c14674aa8634f2a1420fe7 (patch) | |
| tree | 1b8c621a984b8413596a59af6f031a24f9badb9c /ext/pcre/php_pcre.c | |
| parent | 32721aa9d59519e5831014575633e9505f2fd6d5 (diff) | |
| parent | e4539042516f337435c07a6e207eb5178e199d9a (diff) | |
| download | php-git-d20372cf6cbb5a3e44c14674aa8634f2a1420fe7.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72463 mail fails with invalid argument
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 9225c0f976..a08770bd88 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1331,7 +1331,7 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su break; } new_len = result_len + subject_len - start_offset; - if (new_len > alloc_len) { + if (new_len >= alloc_len) { alloc_len = new_len; /* now we know exactly how long it is */ if (NULL != result) { result = zend_string_realloc(result, alloc_len, 0); |