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

Fixed EG(error_zval) handling

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-25 23:39:25 +04:00
parent f0e9a108a7
commit 329a576f39
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_execute.c
View File

@@ -1383,7 +1383,7 @@ static void zend_fetch_property_address(zval *result, zval *container, zval *pro
{
if (Z_TYPE_P(container) != IS_OBJECT) {
if (container == &EG(error_zval)) {
result = &EG(error_zval);
ZVAL_INDIRECT(result, &EG(error_zval));
return;
}
@@ -1398,7 +1398,7 @@ static void zend_fetch_property_address(zval *result, zval *container, zval *pro
object_init(container);
} else {
zend_error(E_WARNING, "Attempt to modify property of non-object");
result = &EG(error_zval);
ZVAL_INDIRECT(result, &EG(error_zval));
return;
}
}
@@ -1408,7 +1408,8 @@ static void zend_fetch_property_address(zval *result, zval *container, zval *pro
if (NULL == ptr) {
if (Z_OBJ_HT_P(container)->read_property &&
(ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, type, key TSRMLS_CC)) != NULL) {
ZVAL_COPY(result, ptr);
//??? ZVAL_COPY(result, ptr);
ZVAL_INDIRECT(result, ptr);
} else {
zend_error_noreturn(E_ERROR, "Cannot access undefined property for object with overloaded property access");
}
@@ -1418,10 +1419,11 @@ static void zend_fetch_property_address(zval *result, zval *container, zval *pro
}
} else if (Z_OBJ_HT_P(container)->read_property) {
zval *ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, type, key TSRMLS_CC);
ZVAL_COPY(result, ptr);
//??? ZVAL_COPY(result, ptr);
ZVAL_INDIRECT(result, ptr);
} else {
zend_error(E_WARNING, "This object doesn't support property references");
result = &EG(error_zval);
ZVAL_INDIRECT(result, &EG(error_zval));
}
}