diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:38:29 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:38:29 -0800 |
| commit | 90ba99a2c21bc78174741da2b076cc5c3826526c (patch) | |
| tree | 45be7120efb0b668a8c06e33fff3dd3b526fb791 /ext/pcre/php_pcre.c | |
| parent | bba11e32557c59e5d73a67c3f8770ecd2dcd9926 (diff) | |
| parent | 279550ee85493c87dca91feefe9d5b97af82d323 (diff) | |
| download | php-git-90ba99a2c21bc78174741da2b076cc5c3826526c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
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 52d43ced30..55aa3de2e5 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -646,7 +646,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec } offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0); - + memset(offsets, 0, size_offsets*sizeof(int)); /* Allocate match sets array and initialize the values. */ if (global && subpats && subpats_order == PREG_PATTERN_ORDER) { match_sets = (zval **)safe_emalloc(num_subpats, sizeof(zval *), 0); |