diff options
| author | Anatol Belski <ab@php.net> | 2016-03-29 11:27:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-03-29 11:27:39 +0200 |
| commit | d1ac9edc50f986cd74c8609fcffccad2987ed095 (patch) | |
| tree | 94c6b3f49c03a180b9283a9340bad85099c15cd3 /ext/standard/url.c | |
| parent | 0a2746fb4be96fd3eff6f1989f3a07ca878b4bcf (diff) | |
| parent | f2ca3c60368f6a9a24f1d69f0305ad03902a0b3e (diff) | |
| download | php-git-d1ac9edc50f986cd74c8609fcffccad2987ed095.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Updated to version 2016.3 (2016c)
Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
Fix bug #71798 - Integer Overflow in php_raw_url_encode
update NEWS
Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Fix bug #71860: Require valid paths for phar filenames
Fix bug #71860: Require valid paths for phar filenames
update NEWS
Fixed bug #71704 php_snmp_error() Format String Vulnerability
Merge branch 'PHP-5.6' into PHP-7.0
Updated to version 2016.2 (2016b)
update libs versions
set RC1 versions
Going for 5.5.34
Diffstat (limited to 'ext/standard/url.c')
| -rw-r--r-- | ext/standard/url.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index b83814422b..d69c11f1c1 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -621,7 +621,7 @@ PHPAPI size_t php_url_decode(char *str, size_t len) */ PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len) { - register int x, y; + register size_t x, y; zend_string *str; str = zend_string_safe_alloc(3, len, 0, 0); |