com php-src: Merge branch 'PHP-5.6': ext/phar/phar.c
| From: | Xinchen Hui | Date: | Wed, 15 Apr 2015 02:44:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/phar/phar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86253@lists.php.net to get a copy of this message | ||
Commit: 556e6f6cb1e68836150686a98e6130fd7429dc4d
Author: Xinchen Hui <laruence@php.net> Wed, 15 Apr 2015 10:44:51 +0800
Parents: 108ae7961e3320f9b8ff20b98e2ddb324e0c868d caf4beab2d6700f0c655cef4d1909832b83df741
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=556e6f6cb1e68836150686a98e6130fd7429dc4d
Log:
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_exceptions.c
Changed paths:
MM ext/phar/phar.c
Diff:
diff --cc ext/phar/phar.c
index a28a5ea,a861a03..32f6416
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@@ -609,12 -606,14 +609,13 @@@ int phar_parse_metadata(char **buffer,
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);
+ ZVAL_NULL(metadata);
PHP_VAR_UNSERIALIZE_INIT(var_hash);
- if (!php_var_unserialize(metadata, &p, p + zip_metadata_len, &var_hash TSRMLS_CC)) {
+ if (!php_var_unserialize(metadata, &p, p + zip_metadata_len, &var_hash)) {
efree(p_buff);
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
zval_ptr_dtor(metadata);