From 07d6758c86200d85527660989e7aa3c6f37b4f85 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Tue, 20 May 2008 03:56:35 +0000 Subject: [PATCH] relax conversion, so that if a phar has no files, we can convert it to another format without changing the extension --- ext/phar/phar_object.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 2f9661adbb..9c3f52434d 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1819,6 +1819,7 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c char *error; const char *pcr_error; int ext_len = ext ? strlen(ext) : 0; + phar_archive_data **pphar; if (!ext) { if (phar->is_zip) { @@ -1889,12 +1890,18 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c efree(basepath); efree(newname); - if (zend_hash_exists(&(PHAR_GLOBALS->phar_fname_map), newpath, phar->fname_len)) { + if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), newpath, phar->fname_len, (void **) &pphar)) { + if (*pphar == phar) { + if (!zend_hash_num_elements(&phar->manifest)) { + goto its_ok; + } + } efree(oldpath); zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Unable to add newly converted phar \"%s\" to the list of phars, a phar with that name already exists", phar->fname); return NULL; } +its_ok: if (!phar->is_data) { if (SUCCESS != phar_detect_phar_fname_ext(newpath, phar->fname_len, (const char **) &(phar->ext), &(phar->ext_len), 1, 1, 1 TSRMLS_CC)) { efree(oldpath); -- 2.50.1