diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-15 10:39:17 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-15 10:39:17 +0800 |
| commit | caf4beab2d6700f0c655cef4d1909832b83df741 (patch) | |
| tree | 7e8950ee08d01eb4f434106760e561cec0e7b1c9 /ext | |
| parent | 9d7b5e30ebbac1a250e794da1e845db800ec20ce (diff) | |
| parent | 82ec0d5fc5fd7e06153c0c658875cd8eaca9cd61 (diff) | |
| download | php-git-caf4beab2d6700f0c655cef4d1909832b83df741.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/phar/phar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 2f2c4d35f6..a861a03464 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -606,7 +606,8 @@ int phar_parse_metadata(char **buffer, zval **metadata, php_uint32 zip_metadata_ php_unserialize_data_t var_hash; if (zip_metadata_len) { - const unsigned char *p, *p_buff = estrndup(*buffer, zip_metadata_len); + const unsigned char *p; + unsigned char *p_buff = (unsigned char *)estrndup(*buffer, zip_metadata_len); p = p_buff; ALLOC_ZVAL(*metadata); INIT_ZVAL(**metadata); |