php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Fixed crash on self-referencing constant expression (part of a constant AST)
This commit is contained in:
Dmitry Stogov
2014-07-24 00:59:42 +04:00
parent 4c37e69957 d909b6330e
commit 39740a33e5
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/constant_expressions_self_referencing_array.phpt
-2
View File
@@ -1,7 +1,5 @@
--TEST--
Self-referencing constant expression (part of a constant AST)
--XFAIL--
Not yet fixed, to be fixed for PHP 5.6
--FILE--
<?php
class A {
Zend/zend_ast.c
+13 -4
View File
@@ -251,10 +251,19 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s
zval_dtor(&op2);
break;
case ZEND_CONST:
*result = *ast->u.val;
zval_copy_ctor(result);
if (IS_CONSTANT_TYPE(Z_TYPE_P(result))) {
zval_update_constant_ex(&result, 1, scope TSRMLS_CC);
/* class constants may be updated in-place */
if (scope) {
if (IS_CONSTANT_TYPE(Z_TYPE_P(ast->u.val))) {
zval_update_constant_ex(&ast->u.val, 1, scope TSRMLS_CC);
}
*result = *ast->u.val;
zval_copy_ctor(result);
} else {
*result = *ast->u.val;
zval_copy_ctor(result);
if (IS_CONSTANT_TYPE(Z_TYPE_P(result))) {
zval_update_constant_ex(&result, 1, scope TSRMLS_CC);
}
}
break;
case ZEND_BOOL_AND:
ext/reflection/php_reflection.c
+11 -2
View File
@@ -728,12 +728,17 @@ static void _parameter_string(string *str, zend_function *fptr, struct _zend_arg
if (precv && precv->opcode == ZEND_RECV_INIT && precv->op2_type != IS_UNUSED) {
zval *zv, zv_copy;
int use_copy;
zend_class_entry *old_scope;
string_write(str, " = ", sizeof(" = ")-1);
ALLOC_ZVAL(zv);
*zv = *precv->op2.zv;
zval_copy_ctor(zv);
INIT_PZVAL(zv);
zval_update_constant_ex(&zv, 1, fptr->common.scope TSRMLS_CC);
old_scope = EG(scope);
EG(scope) = fptr->common.scope;
zval_update_constant_ex(&zv, 1, NULL TSRMLS_CC);
EG(scope) = old_scope;
if (Z_TYPE_P(zv) == IS_BOOL) {
if (Z_LVAL_P(zv)) {
string_write(str, "true", sizeof("true")-1);
@@ -2579,6 +2584,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
{
parameter_reference *param;
zend_op *precv;
zend_class_entry *old_scope;
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -2599,7 +2605,10 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
if (!IS_CONSTANT_TYPE(Z_TYPE_P(return_value))) {
zval_copy_ctor(return_value);
}
zval_update_constant_ex(&return_value, 0, param->fptr->common.scope TSRMLS_CC);
old_scope = EG(scope);
EG(scope) = param->fptr->common.scope;
zval_update_constant_ex(&return_value, 0, NULL TSRMLS_CC);
EG(scope) = old_scope;
}
/* }}} */