diff options
| author | Xinchen Hui <laruence@php.net> | 2013-01-04 11:05:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-01-04 11:05:53 +0800 |
| commit | c4f2a20f150c6e2b453cdd16f5ca1715ab150f7a (patch) | |
| tree | 727c1e3e50c24ee7dc39d93c4e99b6ee1f42669a | |
| parent | 1dda0c55d5945872666f2a6f359c5be5be554011 (diff) | |
| parent | 2feea39a3320d100bae8a1193aba9022726a24ea (diff) | |
| download | php-git-c4f2a20f150c6e2b453cdd16f5ca1715ab150f7a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -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 2e0dcd6b72..5e2d32b157 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4936,7 +4936,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)); } |