diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-09 16:30:46 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-09 16:33:33 +0200 |
| commit | e56e53a59dc1257210939f99975b6617a77e63e4 (patch) | |
| tree | 69cc6912a58d9e1ae52847a36dea6d3be0369539 /Zend/zend_objects.c | |
| parent | 257dbb04501391e0ac57e66aebe2e4d25dcc5c91 (diff) | |
| download | php-git-e56e53a59dc1257210939f99975b6617a77e63e4.tar.gz | |
Back up fake_scope in zend_call_function
We regularly find new places where we forgot to reset fake_scope.
Instead of having to handle this for each caller of zend_call_function()
and similar APIs, handle it directly in zend_call_function().
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index f25983ece3..0e873f0681 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -97,7 +97,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) if (destructor) { zend_object *old_exception; - zend_class_entry *orig_fake_scope; if (destructor->op_array.fn_flags & (ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED)) { if (destructor->op_array.fn_flags & ZEND_ACC_PRIVATE) { @@ -156,8 +155,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) EG(exception) = NULL; } } - orig_fake_scope = EG(fake_scope); - EG(fake_scope) = NULL; zend_call_known_instance_method_with_0_params(destructor, object, NULL); @@ -169,7 +166,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object) } } OBJ_RELEASE(object); - EG(fake_scope) = orig_fake_scope; } } |