diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-21 19:05:15 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-21 19:05:15 +0400 |
| commit | 6d5ce339e6a26c2c5fe98e034a9d8895d7feec4c (patch) | |
| tree | aa47151ec155fb2a016609d068756e43c4ba6bc3 /Zend/zend_execute.c | |
| parent | a4f2c6ea15504bbd9898cd9bd428cd557336d869 (diff) | |
| parent | 47fb19853335e4f155700a9284bbfc1fde1b4bd6 (diff) | |
| download | php-git-6d5ce339e6a26c2c5fe98e034a9d8895d7feec4c.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, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c1fe7ce49f..21efb7fdd2 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -642,8 +642,9 @@ 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 = cur_arg_info->class_name; + zend_string *key = STR_INIT(cur_arg_info->class_name, cur_arg_info->class_name_len, 0); *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 "; |