From 2f438342ecef4efd207becddf9cea46d0d3a2f00 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 14 Dec 2016 17:56:31 +0100 Subject: [PATCH] Fixed bug #73727 Error introduced when refactoring zend_alloc code into zend_bitset. --- NEWS | 2 ++ Zend/zend_bitset.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1eea23c36e..e6e9c3480d 100644 --- 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 12c58b1a41..c909887b08 100644 --- 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 -- 2.50.1