]> granicus.if.org Git - php/commitdiff
Finish Zip (all tests pass)
authorXinchen Hui <laruence@php.net>
Mon, 5 May 2014 09:48:49 +0000 (17:48 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 5 May 2014 09:48:49 +0000 (17:48 +0800)
ext/zip/php_zip.c

index d73290d90f23898f0c4503767dcac6fdb180e407..da64cc10cdc81f11c98584d13a72092ad2cc147a 100644 (file)
@@ -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;