From d1cab93e211d21d637a30894f64a6e13ef217166 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 26 May 2024 13:36:59 +0200
Subject: [PATCH] Use a ROL for mangling the pointer key in namespace_compat.c

This might be a safer than throwing the lower bits away.
---
 ext/dom/namespace_compat.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ext/dom/namespace_compat.c b/ext/dom/namespace_compat.c
index 3754a2c4e04cb..96fc90d08138b 100644
--- a/ext/dom/namespace_compat.c
+++ b/ext/dom/namespace_compat.c
@@ -355,12 +355,9 @@ PHP_DOM_EXPORT void php_dom_reconcile_attribute_namespace_after_insertion(xmlAtt
 static zend_always_inline zend_long dom_mangle_pointer_for_key(void *ptr)
 {
 	zend_ulong value = (zend_ulong) (uintptr_t) ptr;
-	/* Shift 3/4 for better hash distribution because the low 3/4 bits are always 0. */
-#if SIZEOF_ZEND_LONG == 8
-	return value >> 4;
-#else
-	return value >> 3;
-#endif
+	/* Rotate 3/4 bits for better hash distribution because the low 3/4 bits are normally 0. */
+	const size_t rol_amount = (SIZEOF_ZEND_LONG == 8) ? 4 : 3;
+	return (value >> rol_amount) | (value << (sizeof(value) * 8 - rol_amount));
 }
 
 static zend_always_inline void php_dom_libxml_reconcile_modern_single_node(dom_libxml_reconcile_ctx *ctx, xmlNodePtr node)