diff options
| author | Felipe Pena <felipe@php.net> | 2010-05-02 18:47:27 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-05-02 18:47:27 +0000 |
| commit | 155bdc8a72b614f101b1d024833f88a575819551 (patch) | |
| tree | 8b9f8fd5028ffef372c1593547e28de1484e2f3e | |
| parent | 9568c8e398ddd35ca88393ccf567dd56b1ffb0f3 (diff) | |
| download | php-git-155bdc8a72b614f101b1d024833f88a575819551.tar.gz | |
- WS
| -rw-r--r-- | Zend/zend_compile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index d55fcfface..9a36972eed 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3462,7 +3462,6 @@ static int _merge_functions_to_class(zend_function *fn TSRMLS_DC, int num_args, /* efree(fn); */ } - /* efree(lcname.v); */ return ZEND_HASH_APPLY_REMOVE; } @@ -3538,6 +3537,7 @@ static int _copy_functions(zend_function *fn TSRMLS_DC, int num_args, va_list ar zend_uint lcname2_len; char* lcname2; zend_function fn_copy2 = *fn; + _duplicate_function(&fn_copy2, estrndup(aliases[i]->alias, aliases[i]->alias_len)); if (aliases[i]->modifiers) { /* if it is 0, no modifieres has been changed */ @@ -3607,7 +3607,8 @@ void init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */ j = 0; while (cur_precedence->exclude_from_classes[j]) { char* class_name = (char*)cur_precedence->exclude_from_classes[j]; - zend_uint name_length = strlen(class_name); + zend_uint name_length = strlen(class_name); + cur_ce = zend_fetch_class(class_name, name_length, ZEND_FETCH_CLASS_TRAIT TSRMLS_CC); efree(class_name); cur_precedence->exclude_from_classes[j] = cur_ce; @@ -3803,7 +3804,7 @@ void zend_prepare_reference(znode *result, znode *class_name, znode *method_name method_ref->mname_len = Z_STRLEN(method_name->u.constant); result->u.op.ptr = method_ref; - result->op_type = IS_TMP_VAR; + result->op_type = IS_TMP_VAR; } /* }}} */ |