mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Zend/tests/bug54265.phpt

Browse Source
This commit is contained in:
Dmitry Stogov 2014-07-29 14:34:43 +04:00
parent 046db57049
commit cad6408a3f
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Zend/zend_execute.c
View File

@ -697,34 +697,23 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval *p
if (Z_TYPE_P(object) == IS_NULL ||
Z_TYPE_P(object) == IS_FALSE ||
(Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0)) {
//??? The following block may handle only non-interned empty string,
//??? but it doesn't work anyway
//??? see: Zend/tests/bug54265.phpt
#if 0
if (Z_REFCOUNTED_P(object)) {
if (!Z_ISREF_P(object_ptr)) {
SEPARATE_ZVAL(object);
}
Z_ADDREF_P(object);
zend_error(E_WARNING, "Creating default object from empty value");
if (Z_REFCOUNT_P(object) == 1) {
/* object was removed by error handler, nothing to assign to */
zval_ptr_dtor(object);
if (retval) {
ZVAL_NULL(retval);
}
FREE_OP(free_value);
return;
}
Z_DELREF_P(object);
} else {
zend_error(E_WARNING, "Creating default object from empty value");
}
#else
zend_error(E_WARNING, "Creating default object from empty value");
#endif
zval_dtor(object);
zend_object *obj;
zval_ptr_dtor(object);
object_init(object);
Z_ADDREF_P(object);
obj = Z_OBJ_P(object);
zend_error(E_WARNING, "Creating default object from empty value");
if (GC_REFCOUNT(obj) == 1) {
/* the enclosing container was deleted, obj is unreferenced */
if (retval) {
ZVAL_NULL(retval);
}
FREE_OP(free_value);
OBJ_RELEASE(obj);
return;
}
Z_DELREF_P(object);
} else {
zend_error(E_WARNING, "Attempt to assign property of non-object");
if (retval) {