Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit 70b65f310016 · 2012-12-10T20:30:39.000+08:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3708,6 +3708,8 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na
 				(*property)->value = value->value;
 				if (Z_REFCOUNT_P(value) > 0) {
 					zval_copy_ctor(*property);
+				} else {
+					efree(value);
 				}
 			} else {
 				zval *garbage = *property;
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -3463,7 +3463,7 @@ static zend_bool do_inherit_property_access_check(HashTable *target_ht, zend_pro
 		if ((child_info->flags & ZEND_ACC_PPP_MASK) > (parent_info->flags & ZEND_ACC_PPP_MASK)) {
 			zend_error(E_COMPILE_ERROR, "Access level to %s::$%s must be %s (as in class %s)%s", ce->name, hash_key->arKey, zend_visibility_string(parent_info->flags), parent_ce->name, (parent_info->flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
 		} else if ((child_info->flags & ZEND_ACC_STATIC) == 0) {
-			Z_DELREF_P(ce->default_properties_table[parent_info->offset]);
+			zval_ptr_dtor(&(ce->default_properties_table[parent_info->offset]));
 			ce->default_properties_table[parent_info->offset] = ce->default_properties_table[child_info->offset];
 			ce->default_properties_table[child_info->offset] = NULL;
 			child_info->offset = parent_info->offset;
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -539,6 +539,8 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, c
 				(*variable_ptr)->value = value->value;
 				if (Z_REFCOUNT_P(value) > 0) {
 					zval_copy_ctor(*variable_ptr);
+				} else {
+					efree(value);
 				}
 				zval_dtor(&garbage);
 			} else {

Original file line number	Diff line number	Diff line change
`@@ -3708,6 +3708,8 @@ ZEND_API int zend_update_static_property(zend_class_entry scope, const char na`
`3708`	`3708`	`(*property)->value = value->value;`
`3709`	`3709`	`if (Z_REFCOUNT_P(value) > 0) {`
`3710`	`3710`	`zval_copy_ctor(*property);`
	`3711`	`+ } else {`
	`3712`	`+ efree(value);`
`3711`	`3713`	`}`
`3712`	`3714`	`} else {`
`3713`	`3715`	`zval garbage = property;`
Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,8 @@ ZEND_API void zend_std_write_property(zval object, zval member, zval *value, c`
`539`	`539`	`(*variable_ptr)->value = value->value;`
`540`	`540`	`if (Z_REFCOUNT_P(value) > 0) {`
`541`	`541`	`zval_copy_ctor(*variable_ptr);`
	`542`	`+ } else {`
	`543`	`+ efree(value);`
`542`	`544`	`}`
`543`	`545`	`zval_dtor(&garbage);`
`544`	`546`	`} else {`