ext/phar: avoid redundant allocation by using zend_string for alias

Author: arshidkv12

ext/phar/dirstream.c

@@ -355,7 +355,7 @@ int phar_wrapper_mkdir(php_stream_wrapper *wrapper, const char *url_from, int mo
 		return 0;
 	}
 
-	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL)) {
 		phar = NULL;
 	}
 
@@ -481,7 +481,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options
 		return 0;
 	}
 
-	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL)) {
 		phar = NULL;
 	}
 

ext/phar/func_interceptors.c

@@ -99,7 +99,7 @@ static zend_string* phar_get_name_for_relative_paths(zend_string *filename, bool
 	/* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */
 	/* retrieving a file defaults to within the current directory, so use this if possible */
 	phar_archive_data *phar;
-	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL)) {
 		zend_string_release_ex(arch, false);
 		return NULL;
 	}
@@ -494,7 +494,7 @@ static void phar_file_stat(const char *filename, size_t filename_length, int typ
 		zend_string *arch = phar_split_fname(ZSTR_VAL(fname), ZSTR_LEN(fname), NULL, 2, 0);
 		if (arch) {
 			/* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */
-			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL);
+			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL);
 			zend_string_release_ex(arch, false);
 			if (FAILURE == has_archive) {
 				goto skip_phar;
@@ -733,7 +733,7 @@ PHP_FUNCTION(phar_is_file) /* {{{ */
 
 			/* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */
 			/* retrieving a file within the current directory, so use this if possible */
-			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL);
+			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL);
 			zend_string_release_ex(arch, false);
 			if (has_archive == SUCCESS) {
 				phar_entry_info *etemp;
@@ -790,7 +790,7 @@ PHP_FUNCTION(phar_is_link) /* {{{ */
 
 			/* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */
 			/* retrieving a file within the current directory, so use this if possible */
-			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL);
+			zend_result has_archive = phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL);
 			zend_string_release_ex(arch, false);
 			if (has_archive == SUCCESS) {
 				phar_entry_info *etemp;

ext/phar/phar_object.c

@@ -1071,8 +1071,8 @@ static const spl_other_handler phar_spl_foreign_handler = {
  */
 PHP_METHOD(Phar, __construct)
 {
-	char *fname, *alias = NULL, *error, *save_fname;
-	size_t fname_len, alias_len = 0;
+	char *fname, *error, *save_fname;
+	size_t fname_len;
 	bool is_data;
 	zend_long flags = SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS;
 	zend_long format = 0;
@@ -4414,7 +4414,7 @@ PHP_METHOD(PharFileInfo, __construct)
 		RETURN_THROWS();
 	}
 
-	if (phar_open_from_filename(ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, REPORT_ERRORS, &phar_data, &error) == FAILURE) {
+	if (phar_open_from_filename(ZSTR_VAL(arch), ZSTR_LEN(arch), NULL,  REPORT_ERRORS, &phar_data, &error) == FAILURE) {
 		zend_string_release_ex(arch, false);
 		efree(entry);
 		if (error) {

ext/phar/util.c

@@ -308,7 +308,7 @@ zend_string *phar_find_in_include_path(zend_string *filename, phar_archive_data
 	}
 
 	if (*ZSTR_VAL(filename) == '.') {
-		if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, 0, NULL)) {
+		if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(arch), ZSTR_LEN(arch), NULL, NULL)) {
 			zend_string_release_ex(arch, false);
 			return NULL;
 		}