Commit cad713d9941 for php.net
commit cad713d99418df3eef780cdceb60393dc5324984
Author: Gina Peter Banyard <girgias@php.net>
Date: Fri Apr 24 14:25:26 2026 +0100
ext/phar/util.c: use zend_hash_str_exists() in conditions in phar_get_archive()
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
index 5057252a601..71bb5341fb7 100644
--- 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);
}