com php-src: Fix segfault when class name evaluates to IS_CONST: Zend/zend_compile.c
| From: | Nikita Popov | Date: | Tue, 29 Jul 2014 21:17:54 +0000 |
| Subject: | com php-src: Fix segfault when class name evaluates to IS_CONST: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80882@lists.php.net to get a copy of this message | ||
Commit: 6a13a22f9d2118801a7548c329307f89885eff3a
Author: Nikita Popov <nikic@php.net> Tue, 29 Jul 2014 23:17:54 +0200
Parents: 763eb13d6e8979c6c3f5416fbeb0f7031e94a61b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a13a22f9d2118801a7548c329307f89885eff3a
Log:
Fix segfault when class name evaluates to IS_CONST
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7cdc8ef..086ee0b 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3513,21 +3513,25 @@ static void zend_set_class_name_op1(zend_op *opline, znode *class_node
TSRMLS_DC
static zend_op *zend_compile_class_ref(znode *result, zend_ast *name_ast TSRMLS_DC) {
zend_op *opline;
+ znode name_node;
+ zend_compile_expr(&name_node, name_ast TSRMLS_CC);
- if (name_ast->kind == ZEND_AST_ZVAL) {
- zend_uint fetch_type = zend_get_class_fetch_type(zend_ast_get_str(name_ast));
+ if (name_node.op_type == IS_CONST) {
+ zend_string *name = Z_STR(name_node.u.constant);
+ zend_uint fetch_type = zend_get_class_fetch_type(name);
opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, NULL TSRMLS_CC);
opline->extended_value = fetch_type;
if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) {
+ zend_uint type = name_ast->kind == ZEND_AST_ZVAL ? name_ast->attr : ZEND_NAME_FQ;
opline->op2_type = IS_CONST;
opline->op2.constant = zend_add_class_name_literal(CG(active_op_array),
- zend_resolve_class_name_ast(name_ast TSRMLS_CC) TSRMLS_CC);
+ zend_resolve_class_name(name, type TSRMLS_CC) TSRMLS_CC);
}
+
+ STR_RELEASE(name);
} else {
- znode name_node;
- zend_compile_expr(&name_node, name_ast TSRMLS_CC);
opline = zend_emit_op(result, ZEND_FETCH_CLASS, NULL, &name_node TSRMLS_CC);
opline->extended_value = ZEND_FETCH_CLASS_DEFAULT;
}