com php-src: Finish Zip (all tests pass): ext/zip/php_zip.c
| From: | Xinchen Hui | Date: | Mon, 05 May 2014 09:48:49 +0000 |
| Subject: | com php-src: Finish Zip (all tests pass): ext/zip/php_zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78097@lists.php.net to get a copy of this message | ||
Commit: 39c521c05693f3fdac5402e05750f33c98e74e9a
Author: Xinchen Hui <laruence@php.net> Mon, 5 May 2014 17:48:49 +0800
Parents: 356824df4cd26648ef3e099472d527a4e2796362
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39c521c05693f3fdac5402e05750f33c98e74e9a
Log:
Finish Zip (all tests pass)
Changed paths:
M ext/zip/php_zip.c
Diff:
diff --git a/ext/zip/php_zip..c b/ext/zip/php_zip.c
index d73290d..da64cc1 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2144,9 +2144,11 @@ static ZIPARCHIVE_METHOD(getExternalAttributesName)
(zip_flags_t)flags, &opsys, &attr) < 0) {
RETURN_FALSE;
}
- zval_dtor(z_opsys);
+ ZVAL_DEREF(z_opsys);
+ zval_ptr_dtor(z_opsys);
ZVAL_LONG(z_opsys, opsys);
- zval_dtor(z_attr);
+ ZVAL_DEREF(z_attr);
+ zval_ptr_dtor(z_attr);
ZVAL_LONG(z_attr, attr);
RETURN_TRUE;
}
@@ -2179,8 +2181,10 @@ static ZIPARCHIVE_METHOD(getExternalAttributesIndex)
(zip_flags_t)flags, &opsys, &attr) < 0) {
RETURN_FALSE;
}
+ ZVAL_DEREF(z_opsys);
zval_dtor(z_opsys);
ZVAL_LONG(z_opsys, opsys);
+ ZVAL_DEREF(z_attr);
zval_dtor(z_attr);
ZVAL_LONG(z_attr, attr);
RETURN_TRUE;