[php-src] master: Merge branch 'PHP-8.5'

From: Date: Thu, 30 Jul 2026 16:16:25 +0000
Subject: [php-src] master: Merge branch 'PHP-8.5'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140348@lists.php.net to get a copy of this message
Author: Weilin Du (LamentXU123) Date: 2026-07-31T00:10:15+08:00 Commit: https://github.com/php/php-src/commit/22a6f169f2ee691e722600f9f0bf0f84e5dcbc65 Raw diff: https://github.com/php/php-src/commit/22a6f169f2ee691e722600f9f0bf0f84e5dcbc65.diff Merge branch 'PHP-8.5' * PHP-8.5: 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 0a11b4749326..69902f1484ed 100644 --- a/ext/hash/php_hash.h +++ b/ext/hash/php_hash.h @@ -164,7 +164,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;

« previous php.cvs (#140348) next »