diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 18:08:11 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-12 18:08:11 +0400 |
| commit | be82a077769641331ee5914c60df44ba3f862aff (patch) | |
| tree | 673803f676ae69c0a3aabc3046feafdf0361b670 /Zend/zend_execute_API.c | |
| parent | 4e66abad54b25ca367fcb6da78524e3c4024e2a0 (diff) | |
| download | php-git-be82a077769641331ee5914c60df44ba3f862aff.tar.gz | |
Use better data structures (incomplete)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index df91e5f0fa..4894250827 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -797,10 +797,11 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS called_scope = fci_cache->called_scope; fci->object_ptr = fci_cache->object_ptr; ZVAL_COPY_VALUE(&EX(object), fci->object_ptr); -//??? if (fci->object_ptr && Z_TYPE_P(fci->object_ptr) == IS_OBJECT && -//??? (!EG(objects_store).object_buckets || !EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(fci->object_ptr)].valid)) { -//??? return FAILURE; -//??? } + if (fci->object_ptr && Z_TYPE_P(fci->object_ptr) == IS_OBJECT && + (!EG(objects_store).object_buckets || + !IS_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(fci->object_ptr)]))) { + return FAILURE; + } if (EX(function_state).function->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) { if (EX(function_state).function->common.fn_flags & ZEND_ACC_ABSTRACT) { |