com php-src: convert_to_string also does the check : Zend/zend_compile.c
| From: | Xinchen Hui | Date: | Mon, 10 Nov 2014 15:41:55 +0000 |
| Subject: | com php-src: convert_to_string also does the check : Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83000@lists.php.net to get a copy of this message | ||
Commit: 44bc735a62dcbfbd628d8721c2ee83491dcb073c
Author: Xinchen Hui <laruence@php.net> Mon, 10 Nov 2014 23:41:55 +0800
Parents: 28ee04f4804055f03b209ab6489c442ab5a49b00
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=44bc735a62dcbfbd628d8721c2ee83491dcb073c
Log:
convert_to_string also does the check
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d66ed5d..ebbb005 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2985,9 +2985,7 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) /* {{{ */
zend_compile_expr(&name_node, name_ast TSRMLS_CC);
if (name_node.op_type == IS_CONST) {
- if (Z_TYPE(name_node.u.constant) != IS_STRING) {
- convert_to_string(&name_node.u.constant);
- }
+ convert_to_string(&name_node.u.constant);
}
if (zend_try_compile_cv(&result, var_ast TSRMLS_CC) == SUCCESS) {