diff options
| author | Xinchen Hui <laruence@php.net> | 2013-01-04 11:03:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-01-04 11:03:52 +0800 |
| commit | aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b (patch) | |
| tree | 8f5d06721ba95ae8a96bddf2beb48b2f873fbee8 | |
| parent | 5894aa09503eb700b1779d0d6c41b3e2ae698722 (diff) | |
| parent | c3e6de2227f0200b9db318e181603ffba7991489 (diff) | |
| download | php-git-aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 32ee86afd8..9acdc5b35a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4798,7 +4798,7 @@ void zend_do_begin_class_declaration(const znode *class_token, znode *class_name tmp.u.constant = *CG(current_namespace); zval_copy_ctor(&tmp.u.constant); zend_do_build_namespace_name(&tmp, &tmp, class_name TSRMLS_CC); - class_name = &tmp; + *class_name = tmp; efree(lcname); lcname = zend_str_tolower_dup(Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)); } |