Skip to content

Commit c5231ad

Browse files
committed
Fix #76820: Z_COPYABLE invalid definition
We remove the extraneous parenthesis.
1 parent 09ea23f commit c5231ad

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.3.0RC1
44

5+
- Core:
6+
. Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb)
7+
58
- Standard:
69
. Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
710
. Fixed bug #76818 (Memory corruption and segfault). (Remi)

Zend/zend_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
590590
#define Z_REFCOUNTED_P(zval_p) Z_REFCOUNTED(*(zval_p))
591591

592592
/* deprecated: (COPYABLE is the same as IS_ARRAY) */
593-
#define Z_COPYABLE(zval) ((Z_TYPE(zval) == IS_ARRAY)
593+
#define Z_COPYABLE(zval) (Z_TYPE(zval) == IS_ARRAY)
594594
#define Z_COPYABLE_P(zval_p) Z_COPYABLE(*(zval_p))
595595

596596
/* 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) {
610610
#define Z_OPT_REFCOUNTED_P(zval_p) Z_OPT_REFCOUNTED(*(zval_p))
611611

612612
/* deprecated: (COPYABLE is the same as IS_ARRAY) */
613-
#define Z_OPT_COPYABLE(zval) ((Z_OPT_TYPE(zval) == IS_ARRAY)
613+
#define Z_OPT_COPYABLE(zval) (Z_OPT_TYPE(zval) == IS_ARRAY)
614614
#define Z_OPT_COPYABLE_P(zval_p) Z_OPT_COPYABLE(*(zval_p))
615615

616616
#define Z_OPT_ISREF(zval) (Z_OPT_TYPE(zval) == IS_REFERENCE)

0 commit comments

Comments
 (0)