From: Xinchen Hui <laruence@php.net>
Date: Mon, 5 May 2014 09:48:49 +0000 (+0800)
Subject: Finish Zip (all tests pass)
X-Git-Tag: POST_PHPNG_MERGE~412^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39c521c05693f3fdac5402e05750f33c98e74e9a;p=php

Finish Zip (all tests pass)
---

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index d73290d90f..da64cc10cd 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;