php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ASSIGN_OBJ with IS_TMP and IS_CONST operand

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-27 22:53:56 +04:00
parent 3f4759515c
commit 5e4a97f365
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend.c
+3
View File
@@ -400,6 +400,9 @@ ZEND_API void zend_print_zval_r(zval *expr, int indent TSRMLS_DC) /* {{{ */
ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent TSRMLS_DC) /* {{{ */
{
if (Z_ISREF_P(expr)) {
expr = Z_REFVAL_P(expr);
}
switch (Z_TYPE_P(expr)) {
case IS_ARRAY:
ZEND_PUTS_EX("Array\n");
Zend/zend_execute.c
+13 -16
View File
@@ -746,6 +746,7 @@ static inline void zend_assign_to_object(zval *retval, zval *object, zval *prope
{
zend_free_op free_value;
zval *value = get_zval_ptr(value_type, value_op, execute_data, &free_value, BP_VAR_R);
zval tmp;
if (Z_TYPE_P(object) != IS_OBJECT) {
if (object == &EG(error_zval)) {
@@ -788,24 +789,20 @@ static inline void zend_assign_to_object(zval *retval, zval *object, zval *prope
}
/* separate our value if necessary */
//??? if (value_type == IS_TMP_VAR) {
//??? ALLOC_ZVAL(value);
//??? ZVAL_COPY_VALUE(value, orig_value);
//??? Z_UNSET_ISREF_P(value);
//??? Z_SET_REFCOUNT_P(value, 0);
//??? } else if (value_type == IS_CONST) {
//??? zval *orig_value = value;
//???
//??? ALLOC_ZVAL(value);
//??? ZVAL_COPY_VALUE(value, orig_value);
//??? Z_UNSET_ISREF_P(value);
//??? Z_SET_REFCOUNT_P(value, 0);
//??? zval_copy_ctor(value);
//??? }
if (Z_REFCOUNTED_P(value)) {
if (value_type == IS_TMP_VAR) {
if (UNEXPECTED(Z_ISREF_P(value))) {
ZVAL_COPY_VALUE(&tmp, Z_REFVAL_P(value));
value = &tmp;
}
} else if (value_type == IS_CONST) {
if (UNEXPECTED(Z_ISREF_P(value))) {
value = Z_REFVAL_P(value);
}
ZVAL_DUP(&tmp, value);
} else if (Z_REFCOUNTED_P(value)) {
Z_ADDREF_P(value);
}
if (opcode == ZEND_ASSIGN_OBJ) {
if (!Z_OBJ_HT_P(object)->write_property) {
zend_error(E_WARNING, "Attempt to assign property of non-object");