diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:40:15 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:40:15 -0800 |
| commit | bf59acdea75cf13d179f10ce89d296a30f38676d (patch) | |
| tree | 00dc9e0c14f5db7d27ea91956ca9e140f2600919 | |
| parent | a8be707bf11f92141a7e2cdb293249fb903846f8 (diff) | |
| parent | 90ba99a2c21bc78174741da2b076cc5c3826526c (diff) | |
| download | php-git-bf59acdea75cf13d179f10ce89d296a30f38676d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
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
Conflicts:
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 918214edb1..6f9f2aebbf 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -668,7 +668,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec } else { 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); |