Fix #76820: Z_COPYABLE invalid definition

We remove the extraneous parenthesis.

diff --git a/NEWS b/NEWS
index c06a3d8c63da57b33183bd8a71aee2b75b379cb1..97b44fb71bcc9f6f2988316cf5063770972f8d52 100644 (file)
--- 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 7202ad9340067c864ee07fd2347a7e02b2324de1..64f8dee295bea3035b4a8171a8ff35862a6bc28c 100644 (file)
--- 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)