diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-22 16:10:33 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-22 16:10:33 +0300 |
| commit | a561d6a6eee5dcf34272f7c9edf390ed25186dad (patch) | |
| tree | e6b47b0ccbb0a5b6c3a825565d815aef952c3950 | |
| parent | b3e22da745957a6d67bc604268184eb8ba161a08 (diff) | |
| download | php-git-a561d6a6eee5dcf34272f7c9edf390ed25186dad.tar.gz | |
Use OBJ_FLAGS() macro to access object flags (even if they are currently stored together with GC_FLAGS)
| -rw-r--r-- | ext/standard/var_unserializer.c | 6 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index b42e905f07..93df5ae6c2 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -223,13 +223,13 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) BG(serialize_lock)++; if (call_user_function_ex(CG(function_table), zv, &wakeup_name, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { wakeup_failed = 1; - GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; } BG(serialize_lock)--; zval_ptr_dtor(&retval); } else { - GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; } } @@ -603,7 +603,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) { if (has_wakeup) { ZVAL_DEREF(rval); - GC_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; } return 0; } diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 00507b0854..c7a9d2e33b 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -221,13 +221,13 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) BG(serialize_lock)++; if (call_user_function_ex(CG(function_table), zv, &wakeup_name, &retval, 0, 0, 1, NULL) == FAILURE || Z_ISUNDEF(retval)) { wakeup_failed = 1; - GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; } BG(serialize_lock)--; zval_ptr_dtor(&retval); } else { - GC_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(zv)) |= IS_OBJ_DESTRUCTOR_CALLED; } } @@ -607,7 +607,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) { if (has_wakeup) { ZVAL_DEREF(rval); - GC_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(Z_OBJ_P(rval)) |= IS_OBJ_DESTRUCTOR_CALLED; } return 0; } |