Merge branch 'PHP-5.5' into PHP-5.6

12 years ago · 5208113ad1
1 changed files with 1 additions and 1 deletions
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@ -2141,8 +2141,8 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c
 	}
 its_ok:
 	if (SUCCESS == php_stream_stat_path(newpath, &ssb)) {
-		efree(oldpath);
 		zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath);
+		efree(oldpath);
 		return NULL;
 	}
 	if (!phar->is_data) {