From c5231ad394fa3a6c59b9786af977d61da3f1e208 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 30 Aug 2018 18:00:51 +0200 Subject: [PATCH] Fix #76820: Z_COPYABLE invalid definition We remove the extraneous parenthesis. --- NEWS | 3 +++ Zend/zend_types.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c06a3d8c63d..97b44fb71bc 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.0RC1 +- Core: + . Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb) + - Standard: . Fixed bug #76803 (ftruncate changes file pointer). (Anatol) . Fixed bug #76818 (Memory corruption and segfault). (Remi) diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 7202ad93400..64f8dee295b 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -590,7 +590,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) { #define Z_REFCOUNTED_P(zval_p) Z_REFCOUNTED(*(zval_p)) /* deprecated: (COPYABLE is the same as IS_ARRAY) */ -#define Z_COPYABLE(zval) ((Z_TYPE(zval) == IS_ARRAY) +#define Z_COPYABLE(zval) (Z_TYPE(zval) == IS_ARRAY) #define Z_COPYABLE_P(zval_p) Z_COPYABLE(*(zval_p)) /* deprecated: (IMMUTABLE is the same as IS_ARRAY && !REFCOUNTED) */ @@ -610,7 +610,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) { #define Z_OPT_REFCOUNTED_P(zval_p) Z_OPT_REFCOUNTED(*(zval_p)) /* deprecated: (COPYABLE is the same as IS_ARRAY) */ -#define Z_OPT_COPYABLE(zval) ((Z_OPT_TYPE(zval) == IS_ARRAY) +#define Z_OPT_COPYABLE(zval) (Z_OPT_TYPE(zval) == IS_ARRAY) #define Z_OPT_COPYABLE_P(zval_p) Z_OPT_COPYABLE(*(zval_p)) #define Z_OPT_ISREF(zval) (Z_OPT_TYPE(zval) == IS_REFERENCE)