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

arshidkv12 · arshidkv12 · commit f416bb091cb7 · 2026-04-19T08:08:57.000+05:30
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
@@ -286,9 +286,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 				}
 bail:
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -329,9 +326,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 						spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 					}
 					php_stream_close(fp);
-					if (actual_alias) {
-						zend_string_release_ex(actual_alias, myphar->is_persistent);
-					}
 					phar_destroy_phar_data(myphar);
 					return FAILURE;
 				}
@@ -344,9 +338,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -375,9 +366,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (invalid entry size)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -394,9 +382,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -412,9 +397,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -427,9 +409,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -528,9 +507,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 				}
 				zend_string_release_ex(entry.filename, myphar->is_persistent);
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -553,9 +529,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: tar-based phar \"%s\" has invalid metadata in magic file \"%s\"", fname, ZSTR_VAL(entry.filename));
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -568,9 +541,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: tar-based phar \"%s\" has alias that is larger than 511 bytes, cannot process", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -609,9 +579,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: Unable to read alias from tar-based phar \"%s\"", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}
@@ -628,9 +595,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l
 					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);
 				}
 				php_stream_close(fp);
-				if (actual_alias) {
-					zend_string_release_ex(actual_alias, myphar->is_persistent);
-				}
 				phar_destroy_phar_data(myphar);
 				return FAILURE;
 			}

Original file line number	Diff line number	Diff line change
`@@ -286,9 +286,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`286`	`286`	`}`
`287`	`287`	`bail:`
`288`	`288`	`php_stream_close(fp);`
`289`		`- if (actual_alias) {`
`290`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`291`		`- }`
`292`	`289`	`phar_destroy_phar_data(myphar);`
`293`	`290`	`return FAILURE;`
`294`	`291`	`}`
`@@ -329,9 +326,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`329`	`326`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`330`	`327`	`}`
`331`	`328`	`php_stream_close(fp);`
`332`		`- if (actual_alias) {`
`333`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`334`		`- }`
`335`	`329`	`phar_destroy_phar_data(myphar);`
`336`	`330`	`return FAILURE;`
`337`	`331`	`}`
`@@ -344,9 +338,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`344`	`338`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`345`	`339`	`}`
`346`	`340`	`php_stream_close(fp);`
`347`		`- if (actual_alias) {`
`348`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`349`		`- }`
`350`	`341`	`phar_destroy_phar_data(myphar);`
`351`	`342`	`return FAILURE;`
`352`	`343`	`}`
`@@ -375,9 +366,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`375`	`366`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (invalid entry size)", fname);`
`376`	`367`	`}`
`377`	`368`	`php_stream_close(fp);`
`378`		`- if (actual_alias) {`
`379`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`380`		`- }`
`381`	`369`	`phar_destroy_phar_data(myphar);`
`382`	`370`	`return FAILURE;`
`383`	`371`	`}`
`@@ -394,9 +382,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`394`	`382`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`395`	`383`	`}`
`396`	`384`	`php_stream_close(fp);`
`397`		`- if (actual_alias) {`
`398`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`399`		`- }`
`400`	`385`	`phar_destroy_phar_data(myphar);`
`401`	`386`	`return FAILURE;`
`402`	`387`	`}`
`@@ -412,9 +397,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`412`	`397`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`413`	`398`	`}`
`414`	`399`	`php_stream_close(fp);`
`415`		`- if (actual_alias) {`
`416`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`417`		`- }`
`418`	`400`	`phar_destroy_phar_data(myphar);`
`419`	`401`	`return FAILURE;`
`420`	`402`	`}`
`@@ -427,9 +409,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`427`	`409`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`428`	`410`	`}`
`429`	`411`	`php_stream_close(fp);`
`430`		`- if (actual_alias) {`
`431`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`432`		`- }`
`433`	`412`	`phar_destroy_phar_data(myphar);`
`434`	`413`	`return FAILURE;`
`435`	`414`	`}`
`@@ -528,9 +507,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`528`	`507`	`}`
`529`	`508`	`zend_string_release_ex(entry.filename, myphar->is_persistent);`
`530`	`509`	`php_stream_close(fp);`
`531`		`- if (actual_alias) {`
`532`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`533`		`- }`
`534`	`510`	`phar_destroy_phar_data(myphar);`
`535`	`511`	`return FAILURE;`
`536`	`512`	`}`
`@@ -553,9 +529,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`553`	`529`	`spprintf(error, 4096, "phar error: tar-based phar \"%s\" has invalid metadata in magic file \"%s\"", fname, ZSTR_VAL(entry.filename));`
`554`	`530`	`}`
`555`	`531`	`php_stream_close(fp);`
`556`		`- if (actual_alias) {`
`557`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`558`		`- }`
`559`	`532`	`phar_destroy_phar_data(myphar);`
`560`	`533`	`return FAILURE;`
`561`	`534`	`}`
`@@ -568,9 +541,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`568`	`541`	`spprintf(error, 4096, "phar error: tar-based phar \"%s\" has alias that is larger than 511 bytes, cannot process", fname);`
`569`	`542`	`}`
`570`	`543`	`php_stream_close(fp);`
`571`		`- if (actual_alias) {`
`572`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`573`		`- }`
`574`	`544`	`phar_destroy_phar_data(myphar);`
`575`	`545`	`return FAILURE;`
`576`	`546`	`}`
`@@ -609,9 +579,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`609`	`579`	`spprintf(error, 4096, "phar error: Unable to read alias from tar-based phar \"%s\"", fname);`
`610`	`580`	`}`
`611`	`581`	`php_stream_close(fp);`
`612`		`- if (actual_alias) {`
`613`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`614`		`- }`
`615`	`582`	`phar_destroy_phar_data(myphar);`
`616`	`583`	`return FAILURE;`
`617`	`584`	`}`
`@@ -628,9 +595,6 @@ zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_l`
`628`	`595`	`spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname);`
`629`	`596`	`}`
`630`	`597`	`php_stream_close(fp);`
`631`		`- if (actual_alias) {`
`632`		`- zend_string_release_ex(actual_alias, myphar->is_persistent);`
`633`		`- }`
`634`	`598`	`phar_destroy_phar_data(myphar);`
`635`	`599`	`return FAILURE;`
`636`	`600`	`}`