ext/phar/util.c: use zend_hash_str_exists() in conditions in phar_get_archive()

Girgias · Girgias · commit cad713d99418 · 2026-04-24T14:25:26.000+01:00
We don't actually care about the returned pointer, so use a clearer API to better communicate intent.
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -984,7 +984,7 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
 				return FAILURE;
 			}
 
-			if (PHAR_G(last_phar)->alias_len && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len))) {
+			if (PHAR_G(last_phar)->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len)) {
 				zend_hash_str_del(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len);
 			}
 
@@ -1049,7 +1049,7 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
 					return FAILURE;
 				}
 
-				if (fd->alias_len && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len))) {
+				if (fd->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len)) {
 					zend_hash_str_del(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len);
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,7 @@ zend_result phar_get_archive(phar_archive_data *archive, const char fname, siz`
`984`	`984`	`return FAILURE;`
`985`	`985`	`}`
`986`	`986`
`987`		`- if (PHAR_G(last_phar)->alias_len && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len))) {`
	`987`	`+ if (PHAR_G(last_phar)->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len)) {`
`988`	`988`	`zend_hash_str_del(&(PHAR_G(phar_alias_map)), PHAR_G(last_phar)->alias, PHAR_G(last_phar)->alias_len);`
`989`	`989`	`}`
`990`	`990`
`@@ -1049,7 +1049,7 @@ zend_result phar_get_archive(phar_archive_data *archive, const char fname, siz`
`1049`	`1049`	`return FAILURE;`
`1050`	`1050`	`}`
`1051`	`1051`
`1052`		`- if (fd->alias_len && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len))) {`
	`1052`	`+ if (fd->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len)) {`
`1053`	`1053`	`zend_hash_str_del(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len);`
`1054`	`1054`	`}`
`1055`	`1055`