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

Author: arshidkv12

ext/phar/dirstream.c

@@ -276,7 +276,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, const char *path,
 
 	phar_request_initialize();
 
-	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(resource->host), ZSTR_LEN(resource->host), NULL, 0, &error)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(resource->host), ZSTR_LEN(resource->host), NULL, &error)) {
 		if (error) {
 			php_stream_wrapper_log_error(wrapper, options, "%s", error);
 			efree(error);
@@ -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, arch, arch_len, NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, NULL)) {
 		phar = NULL;
 	}
 
@@ -383,7 +383,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(resource->host), ZSTR_LEN(resource->host), NULL, 0, &error)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(resource->host), ZSTR_LEN(resource->host), NULL, &error)) {
 		php_stream_wrapper_log_error(wrapper, options, "phar error: cannot create directory \"%s\" in phar \"%s\", error retrieving phar information: %s", ZSTR_VAL(resource->path) + 1, ZSTR_VAL(resource->host), error);
 		efree(error);
 		php_url_free(resource);
@@ -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, arch, arch_len, NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, NULL)) {
 		phar = NULL;
 	}
 
@@ -509,7 +509,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options
 		return 0;
 	}
 
-	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(resource->host), ZSTR_LEN(resource->host), NULL, 0, &error)) {
+	if (FAILURE == phar_get_archive(&phar, ZSTR_VAL(resource->host), ZSTR_LEN(resource->host), NULL, &error)) {
 		php_stream_wrapper_log_error(wrapper, options, "phar error: cannot remove directory \"%s\" in phar \"%s\", error retrieving phar information: %s", ZSTR_VAL(resource->path)+1, ZSTR_VAL(resource->host), error);
 		efree(error);
 		php_url_free(resource);

ext/phar/func_interceptors.c

@@ -101,7 +101,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, arch, arch_len, NULL, 0, NULL)) {
+	if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, NULL)) {
 		efree(arch);
 		return NULL;
 	}
@@ -496,7 +496,7 @@ static void phar_file_stat(const char *filename, size_t filename_length, int typ
 		size_t arch_len;
 		if (SUCCESS == phar_split_fname(ZSTR_VAL(fname), ZSTR_LEN(fname), &arch, &arch_len, NULL, 2, 0)) {
 			/* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */
-			zend_result has_archive = phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL);
+			zend_result has_archive = phar_get_archive(&phar, arch, arch_len, NULL, NULL);
 			efree(arch);
 			if (FAILURE == has_archive) {
 				goto skip_phar;
@@ -736,7 +736,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 */
-			if (SUCCESS == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL)) {
+			if (SUCCESS == phar_get_archive(&phar, arch, arch_len, NULL, NULL)) {
 				phar_entry_info *etemp;
 
 				zend_string *entry = phar_fix_filepath(filename, filename_len, true);
@@ -794,7 +794,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 */
-			if (SUCCESS == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL)) {
+			if (SUCCESS == phar_get_archive(&phar, arch, arch_len, NULL, NULL)) {
 				phar_entry_info *etemp;
 
 				zend_string *entry = phar_fix_filepath(filename, filename_len, true);