archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #73727

Browse source 
Error introduced when refactoring zend_alloc code into zend_bitset.
This commit is contained in:
Nikita Popov 2016-12-14 17:56:31 +01:00
parent 1820f4b9d1
commit 2f438342ec
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

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

4
Zend/zend_bitset.h
View file

@ -56,14 +56,14 @@ static zend_always_inline int zend_ulong_ntz(zend_ulong num)
if (!BitScanForward(&index, num)) { if (!BitScanForward(&index, num)) {
#endif #endif
/* undefined behavior */ /* undefined behavior */
return 32; return SIZEOF_ZEND_LONG * 8;
} }
return (int) index; return (int) index;
#else #else
int n; int n;
if (num == Z_UL(0)) return ZEND_MM_BITSET_LEN; if (num == Z_UL(0)) return SIZEOF_ZEND_LONG * 8;
n = 1; n = 1;
#if SIZEOF_ZEND_LONG == 8 #if SIZEOF_ZEND_LONG == 8