diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-21 18:55:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-21 18:55:26 +0400 |
| commit | a4f2c6ea15504bbd9898cd9bd428cd557336d869 (patch) | |
| tree | 319839c2ea54b78f5252e010e6d4740362c2cb8c /Zend/zend_API.c | |
| parent | 686ea7f20e376de71d361c3b81164cf6840ba69b (diff) | |
| parent | 013cc55395e2b60e801eb9a8bced0219d17df129 (diff) | |
| download | php-git-a4f2c6ea15504bbd9898cd9bd428cd557336d869.tar.gz | |
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 4ffe6c4082..436fdae1b7 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -176,7 +176,9 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TS while (param_count-->0) { zval *param = p-(arg_count--); - Z_ADDREF_P(param); + if (Z_REFCOUNTED_P(param)) { + Z_ADDREF_P(param); + } add_next_index_zval(argument_array, param); } @@ -3151,7 +3153,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch } } else { - if (!!EG(objects_store).object_buckets || + if (!EG(objects_store).object_buckets || !IS_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(obj)])) { return 0; } |