diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-24 11:08:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-24 11:08:53 +0800 |
| commit | 59933934be9f1642f8433e35fc9d89277a3293ca (patch) | |
| tree | 7258233f3e94402c5e40b44066ae2b46bee9aa83 | |
| parent | 19adcf8cb963de77232d503f898a77b022c7838f (diff) | |
| parent | 3e0b2ba5d83b2dc7824ffa4ea4cfa6a4f8c6e645 (diff) | |
| download | php-git-59933934be9f1642f8433e35fc9d89277a3293ca.tar.gz | |
Merge branch 'PHP-7.0'
| -rw-r--r-- | ext/standard/var_unserializer.c | 16 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index f4c2b32dd5..3284ad31c3 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1289,16 +1289,16 @@ yy97: zval_ptr_dtor(rval); if (Z_ISREF_P(rval_ref)) { - if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) { - ZVAL_COPY(rval, rval_ref); - } else { - ZVAL_UNDEF(rval); - } + if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) { + ZVAL_COPY(rval, rval_ref); + } else { + ZVAL_UNDEF(rval); + } } else if (Z_ISUNDEF_P(rval_ref)) { - ZVAL_UNDEF(rval); + ZVAL_UNDEF(rval); } else { - ZVAL_NEW_REF(rval_ref, rval_ref); - ZVAL_COPY(rval, rval_ref); + ZVAL_NEW_REF(rval_ref, rval_ref); + ZVAL_COPY(rval, rval_ref); } return 1; diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 0ebca3d682..d652d3330a 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -523,16 +523,16 @@ PHPAPI int php_var_unserialize_ex(UNSERIALIZE_PARAMETER) zval_ptr_dtor(rval); if (Z_ISREF_P(rval_ref)) { - if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) { - ZVAL_COPY(rval, rval_ref); - } else { - ZVAL_UNDEF(rval); - } + if (!Z_ISUNDEF_P(Z_REFVAL_P(rval_ref))) { + ZVAL_COPY(rval, rval_ref); + } else { + ZVAL_UNDEF(rval); + } } else if (Z_ISUNDEF_P(rval_ref)) { - ZVAL_UNDEF(rval); + ZVAL_UNDEF(rval); } else { - ZVAL_NEW_REF(rval_ref, rval_ref); - ZVAL_COPY(rval, rval_ref); + ZVAL_NEW_REF(rval_ref, rval_ref); + ZVAL_COPY(rval, rval_ref); } return 1; |