review round

php · Jan 19, 2025 · 17efa1d · 17efa1d
1 parent 8d0161a
commit 17efa1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
@@ -2863,10 +2863,10 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 	 *  ?: phar metadata
 	 */
 	size_t written_alias_len;
-	if (phar->is_temporary_alias) {
+	if (phar->is_temporary_alias || !phar->alias) {
 		written_alias_len = 0;
 	} else {
-		written_alias_len = ZSTR_LEN(phar->alias); // TODO: null alias?
+		written_alias_len = ZSTR_LEN(phar->alias);
 	}
 
 	manifest_len = offset + written_alias_len + sizeof(manifest) + (main_metadata_str.s ? ZSTR_LEN(main_metadata_str.s) : 0);

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -2762,8 +2762,7 @@ PHP_METHOD(Phar, setAlias)
 		zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname);
 		RETURN_THROWS();
 	}
-	if (phar_obj->archive->alias && NULL != (fd_ptr = zend_hash_find_ptr(&(PHAR_G(phar_alias_map)), phar_obj->archive->alias))) {
-		zend_hash_del(&(PHAR_G(phar_alias_map)), phar_obj->archive->alias);
+	if (phar_obj->archive->alias && zend_hash_del(&(PHAR_G(phar_alias_map)), phar_obj->archive->alias) == SUCCESS) {
 		readd = 1;
 	}
 

diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -1017,7 +1017,7 @@ zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fn
 				return FAILURE;
 			}
 
-			if (PHAR_G(last_phar)->alias && NULL != (fd_ptr = zend_hash_find_ptr(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias))) {
+			if (PHAR_G(last_phar)->alias) {
 				zend_hash_del(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias);
 			}