From 3332943c9d20a8b5e09816b11f38742de0e16085 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 12 May 2012 13:13:44 +0800 Subject: Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object) --- Zend/zend_execute.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zend/zend_execute.c') diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 705c71389d..4423921649 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -432,11 +432,10 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC) || (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0) || (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0) ) { - zend_error(E_STRICT, "Creating default object from empty value"); - SEPARATE_ZVAL_IF_NOT_REF(object_ptr); zval_dtor(*object_ptr); object_init(*object_ptr); + zend_error(E_STRICT, "Creating default object from empty value"); } } -- cgit v1.2.1 From 896ac689c91967dec0601fa9fe048c518da52a3c Mon Sep 17 00:00:00 2001 From: Marc Easen Date: Mon, 11 Jun 2012 21:47:40 +0100 Subject: Fixed the common misspelling of the word occurred (occured -> occurred) --- Zend/zend_execute.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_execute.c') diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 205531fd28..fbc73258c7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1161,7 +1161,7 @@ convert_to_array: case IS_DOUBLE: case IS_NULL: case IS_BOOL: - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); break; default: zend_error(E_WARNING, "Illegal offset type"); @@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont case IS_NULL: case IS_BOOL: if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); } break; default: -- cgit v1.2.1