Fixed bug #73727

Error introduced when refactoring zend_alloc code into zend_bitset.

diff --git a/NEWS b/NEWS
index 1eea23c36e676b9bbee74ddab3ee8f4d3ad02811..e6e9c3480d956e15f90e3d083843f9d4cd1c78e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
     references). (Nikita, Laruence)
   . Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created
     with list()). (Laruence)
+  . Fixed bug #73727 (ZEND_MM_BITSET_LEN is "undefined symbol" in
+    zend_bitset.h). (Nikita)
 
 - COM:
   . Fixed bug #73679 (DOTNET read access violation using invalid codepage).

diff --git a/Zend/zend_bitset.h b/Zend/zend_bitset.h
index 12c58b1a41d5e0944f42dcb34ad82df430ec307b..c909887b0892cd4d8f2a21f10c716ce7685c28d2 100644 (file)
--- a/Zend/zend_bitset.h
+++ b/Zend/zend_bitset.h
@@ -56,14 +56,14 @@ static zend_always_inline int zend_ulong_ntz(zend_ulong num)
        if (!BitScanForward(&index, num)) {
 #endif
                /* undefined behavior */
-               return 32;
+               return SIZEOF_ZEND_LONG * 8;
        }
 
        return (int) index;
 #else
        int n;
 
-       if (num == Z_UL(0)) return ZEND_MM_BITSET_LEN;
+       if (num == Z_UL(0)) return SIZEOF_ZEND_LONG * 8;
 
        n = 1;
 #if SIZEOF_ZEND_LONG == 8