com php-src: Fixed bug #73727: NEWS Zend/zend_bitset.h
| From: | Nikita Popov | Date: | Wed, 14 Dec 2016 16:56:31 +0000 |
| Subject: | com php-src: Fixed bug #73727: NEWS Zend/zend_bitset.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96329@lists.php.net to get a copy of this message | ||
Commit: 2f438342ecef4efd207becddf9cea46d0d3a2f00
Author: Nikita Popov <nikic@php.net> Wed, 14 Dec 2016 17:56:31 +0100
Parents: 1820f4b9d13e7a35f9f71fd126e1fae1e3f574db
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2f438342ecef4efd207becddf9cea46d0d3a2f00
Log:
Fixed bug #73727
Error introduced when refactoring zend_alloc code into zend_bitset.
Bugs:
https://bugs.php.net/73727
Changed paths:
M NEWS
M Zend/zend_bitset.h
Diff:
diff --git a/NEWS b/NEWS
index 1eea23c..e6e9c34 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 12c58b1..c909887 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