[PHP-CVS] [php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Weilin Du (LamentXU123)
Date: 2026-07-31T00:08:00+08:00

Commit: https://github.com/php/php-src/commit/4ff84aaffae230051a624118178ca63beaf52c28
Raw diff: https://github.com/php/php-src/commit/4ff84aaffae230051a624118178ca63beaf52c28.diff

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix GH-22935: Make php_hash.h includable from C++ code (#22940)

Changed paths:
  M  ext/hash/php_hash.h


Diff:

diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index 34d44137028d..64df283c9ce0 100644
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -166,7 +166,7 @@ static inline void *php_hash_alloc_context(const php_hash_ops *ops) {
 	/* Zero out context memory so serialization doesn't expose internals */
 	if (ops->context_align > 0) {
 		size_t align = ops->context_align;
-		char *base = ecalloc(1, ops->context_size + align);
+		char *base = (char *) ecalloc(1, ops->context_size + align);
 		size_t offset = align - ((uintptr_t)base & (align - 1));
 		char *ptr = base + offset;
 		ptr[-1] = (char)offset;