diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-21 23:02:24 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-21 23:02:24 +0800 |
| commit | 47fb19853335e4f155700a9284bbfc1fde1b4bd6 (patch) | |
| tree | f03840ecbf82c031d335707c753ed3bd3596b0fc /Zend/zend_execute.c | |
| parent | 013cc55395e2b60e801eb9a8bced0219d17df129 (diff) | |
| download | php-git-47fb19853335e4f155700a9284bbfc1fde1b4bd6.tar.gz | |
Revert "Use zend_string for arg_info to fixed segfault in Zend/tests/argument_restriction_003.phpt"
This reverts commit b96318105b8a908ec3cb294b8133e36d1b8cba7a.
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 "; |