diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-28 16:55:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-29 10:00:06 +0200 |
| commit | 31a516cf967e7558f0e06c2390fa9521309ed8b4 (patch) | |
| tree | ea628fa8e185ade2bb5ecdfe5c0526ea13de1046 /Zend/zend_operators.c | |
| parent | cf610347a7a44b292b59c3b9855e93b3d204d63e (diff) | |
| download | php-git-31a516cf967e7558f0e06c2390fa9521309ed8b4.tar.gz | |
Remove set() object handler
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index fd784b7534..5b134e46b7 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2456,18 +2456,7 @@ try_again: } break; case IS_OBJECT: - if (Z_OBJ_HANDLER_P(op1, get) - && Z_OBJ_HANDLER_P(op1, set)) { - /* proxy object */ - zval rv; - zval *val; - - val = Z_OBJ_HANDLER_P(op1, get)(Z_OBJ_P(op1), &rv); - Z_TRY_ADDREF_P(val); - increment_function(val); - Z_OBJ_HANDLER_P(op1, set)(Z_OBJ_P(op1), val); - zval_ptr_dtor(val); - } else if (Z_OBJ_HANDLER_P(op1, do_operation)) { + if (Z_OBJ_HANDLER_P(op1, do_operation)) { zval op2; int res; @@ -2523,18 +2512,7 @@ try_again: } break; case IS_OBJECT: - if (Z_OBJ_HANDLER_P(op1, get) - && Z_OBJ_HANDLER_P(op1, set)) { - /* proxy object */ - zval rv; - zval *val; - - val = Z_OBJ_HANDLER_P(op1, get)(Z_OBJ_P(op1), &rv); - Z_TRY_ADDREF_P(val); - decrement_function(val); - Z_OBJ_HANDLER_P(op1, set)(Z_OBJ_P(op1), val); - zval_ptr_dtor(val); - } else if (Z_OBJ_HANDLER_P(op1, do_operation)) { + if (Z_OBJ_HANDLER_P(op1, do_operation)) { zval op2; int res; |