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_execute.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_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 21efb7fdd2..c1fe7ce49f 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -642,9 +642,8 @@ static inline void make_real_object(zval *object_ptr TSRMLS_DC) ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, char **class_name, zend_class_entry **pce TSRMLS_DC) { - zend_string *key = STR_INIT(cur_arg_info->class_name, cur_arg_info->class_name_len, 0); + zend_string *key = cur_arg_info->class_name; *pce = zend_fetch_class(key, (fetch_type | ZEND_FETCH_CLASS_AUTO | ZEND_FETCH_CLASS_NO_AUTOLOAD) TSRMLS_CC); - STR_FREE(key); *class_name = (*pce) ? (*pce)->name->val : (char*)cur_arg_info->class_name; if (*pce && (*pce)->ce_flags & ZEND_ACC_INTERFACE) { return "implement interface "; |