com php-src: Fixed compound name resolution: Zend/zend_compil e.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 14:55:04 +0000 |
| Subject: | com php-src: Fixed compound name resolution: Zend/zend_compil e.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78015@lists.php.net to get a copy of this message | ||
Commit: 686ea7f20e376de71d361c3b81164cf6840ba69b
Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Feb 2014 18:55:04 +0400
Parents: 25490102783a0aadc1700b549f4d57380df3da22
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=686ea7f20e376de71d361c3b81164cf6840ba69b
Log:
Fixed compound name resolution
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 72d495d..c8c7b90 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7144,7 +7144,7 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /*
{{
zend_str_tolower_copy(c_ns_name->val, Z_STRVAL(CG(current_namespace)),
Z_STRLEN(CG(current_namespace)));
c_ns_name->val[Z_STRLEN(CG(current_namespace))] = '\\';
- memcpy(c_ns_name->val+Z_STRLEN(CG(current_namespace))+1, lcname, Z_STRLEN_P(name)+1);
+ memcpy(c_ns_name->val+Z_STRLEN(CG(current_namespace))+1, lcname->val, Z_STRLEN_P(name)+1);
if (zend_hash_exists(CG(class_table), c_ns_name)) {
char *tmp2 = zend_str_tolower_dup(Z_STRVAL(ns), Z_STRLEN(ns));
@@ -7176,7 +7176,7 @@ void zend_do_use(znode *ns_name, znode *new_name, int is_global TSRMLS_DC) /*
{{
}
zend_error(E_WARNING, "The use statement with non-compound name '%s' has no
effect", Z_STRVAL_P(name));
}
- efree(lcname);
+ STR_RELEASE(lcname);
zval_dtor(name);
}
/* }}} */