com php-src: Use ZEND_HASH_APPLY_SHIFT macro instead of hard-coded literal: Zend/zend_hash.c
| From: | Nikita Popov | Date: | Wed, 23 Aug 2017 20:15:14 +0000 |
| Subject: | com php-src: Use ZEND_HASH_APPLY_SHIFT macro instead of hard-coded literal: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99133@lists.php.net to get a copy of this message | ||
Commit: d938a769b2a8220af657645f25314f704a46030e
Author: Thomas Punt <tpunt@hotmail.co.uk> Tue, 22 Aug 2017 13:32:47 +0100
Committer: Nikita Popov <nikita.ppv@gmail.com> Wed, 23 Aug 2017 22:15:14 +0200
Parents: 5a2a92f128ca94d29ea55ede9919c185ecf5a285
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d938a769b2a8220af657645f25314f704a46030e
Log:
Use ZEND_HASH_APPLY_SHIFT macro instead of hard-coded literal
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index c1ac05c..3d5f584 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -74,7 +74,7 @@ static void _zend_is_inconsistent(const HashTable *ht, const char *file, int lin
#define HASH_PROTECT_RECURSION(ht) \
if ((ht)->u.flags & HASH_FLAG_APPLY_PROTECTION) { \
- if (((ht)->u.flags & ZEND_HASH_APPLY_COUNT_MASK) >= (3 << 8)) { \
+ if (((ht)->u.flags & ZEND_HASH_APPLY_COUNT_MASK) >= (3 << ZEND_HASH_APPLY_SHIFT))
{\
zend_error_noreturn(E_ERROR, "Nesting level too deep - recursive dependency?");\
} \
ZEND_HASH_INC_APPLY_COUNT(ht); \