diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-05-06 09:23:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-05-06 10:47:58 +0300 |
| commit | c19cb70dac3bd4476660d50360f8912ec0b03ebe (patch) | |
| tree | ed64dde4cb2e9176f019467f6c75295c8e023e4c /Zend/zend_object_handlers.c | |
| parent | cb4750f52dac1122366f247a57284a1d7af517be (diff) | |
| download | php-git-c19cb70dac3bd4476660d50360f8912ec0b03ebe.tar.gz | |
Revert "Refactor zval cleanup into single function"
This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 382ee29fb2..22e81dc009 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1680,7 +1680,7 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty ce = Z_OBJCE_P(readobj); zend_error(E_NOTICE, "Object of class %s could not be converted to int", ZSTR_VAL(ce->name)); if (readobj == writeobj) { - zval_ptr_dtor_nogc(readobj); + zval_dtor(readobj); } ZVAL_LONG(writeobj, 1); return SUCCESS; @@ -1688,7 +1688,7 @@ ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int ty ce = Z_OBJCE_P(readobj); zend_error(E_NOTICE, "Object of class %s could not be converted to float", ZSTR_VAL(ce->name)); if (readobj == writeobj) { - zval_ptr_dtor_nogc(readobj); + zval_dtor(readobj); } ZVAL_DOUBLE(writeobj, 1); return SUCCESS; |