com php-src: fixed macro: Zend/zend_types.h
| From: | Dmitry Stogov | Date: | Wed, 01 Feb 2017 13:05:33 +0000 |
| Subject: | com php-src: fixed macro: Zend/zend_types.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96948@lists.php.net to get a copy of this message | ||
Commit: 15e9aa1706533cba39a165f78806400cc913e906
Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Feb 2017 16:05:33 +0300
Parents: 8dfa428ccdec0755a8d71b6faeade5ddc0145aab
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=15e9aa1706533cba39a165f78806400cc913e906
Log:
fixed macro
Changed paths:
M Zend/zend_types.h
Diff:
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index cb5bb9e..7230066 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -912,9 +912,10 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
#define SEPARATE_STRING(zv) do { \
zval *_zv = (zv); \
- if (Z_REFCOUNTED_P(_zv) && \
- Z_REFCOUNT_P(_zv) > 1) { \
- Z_DELREF_P(_zv); \
+ if (Z_REFCOUNT_P(_zv) > 1) { \
+ if (Z_REFCOUNTED_P(_zv)); \
+ Z_DELREF_P(_zv); \
+ } \
zval_copy_ctor_func(_zv); \
} \
} while (0)