diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-01-24 20:00:46 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-01-24 20:00:46 +0100 |
| commit | c637ba118e4a42e5710b7beaf18ae79f4878ed5c (patch) | |
| tree | 7b7d758276eefd0976b2b83b7119266502a6716a | |
| parent | 8dc1287739cd5539a74f950c3c4813461e1de05d (diff) | |
| download | php-git-c637ba118e4a42e5710b7beaf18ae79f4878ed5c.tar.gz | |
Fix segfault when no class ctx is defined
| -rw-r--r-- | Zend/zend_compile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 9e43fdf8e3..bc114530e3 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5731,15 +5731,14 @@ void zend_compile_class_const(znode *result, zend_ast *ast) /* {{{ */ zend_compile_expr(&const_node, const_ast); - if (class_op && const_node.op_type == IS_CONST && class_op->extended_value == ZEND_FETCH_CLASS_SELF && Z_TYPE(const_node.u.constant) == IS_STRING) { + if (class_op && const_node.op_type == IS_CONST && class_op->extended_value == ZEND_FETCH_CLASS_SELF && Z_TYPE(const_node.u.constant) == IS_STRING && CG(active_class_entry)) { zval *const_zv = zend_hash_find(&CG(active_class_entry)->constants_table, Z_STR(const_node.u.constant)); if (const_zv && Z_TYPE_P(const_zv) < IS_CONSTANT) { CG(active_op_array)->last--; CG(active_op_array)->T--; result->op_type = IS_CONST; - Z_TRY_ADDREF_P(const_zv); - result->u.constant = *const_zv; + ZVAL_COPY(&result->u.constant, const_zv); zend_string_release(Z_STR(const_node.u.constant)); return; |