From: Marcus Boerger <helly@php.net>
Date: Sat, 27 Jan 2007 22:23:52 +0000 (+0000)
Subject: - Refcounting
X-Git-Tag: RELEASE_1_0_0RC1~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f86b7b96fc432beab1b9a5665d683ca5e1ec89bb;p=php

- Refcounting
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 6b5c8dabc3..5ca6b87d8e 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -401,6 +401,7 @@ void phar_entry_remove(phar_entry_data *idata TSRMLS_DC) /* {{{ */
 			php_stream_close(idata->fp);
 		}
 		zend_hash_del(&idata->phar->manifest, idata->internal_file->filename, idata->internal_file->filename_len);
+		idata->phar->refcount--;
 		efree(idata);
 	} else {
 		idata->internal_file->is_deleted = 1;
@@ -2521,8 +2522,6 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int optio
 		php_url_free(resource);
 		return FAILURE;
 	}
-	/* faulty increment of phar refcount - nothing persists beyond this function */
-	idata->phar->refcount--;
 	if (idata->internal_file->fp_refcount > 1) {
 		/* more than just our fp resource is open for this file */ 
 		php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: \"%s\" in phar \"%s\", has open file pointers, cannot unlink", internal_file, resource->host);