Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3

johannes · johannes · commit a2cf4f1932fa · 2012-12-10T13:35:27.000+01:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3472,6 +3472,8 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, char *name, in
 				(*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_object_handlers.c b/Zend/zend_object_handlers.c
@@ -437,6 +437,8 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
 				(*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
`@@ -3472,6 +3472,8 @@ ZEND_API int zend_update_static_property(zend_class_entry scope, char name, in`
`3472`	`3472`	`(*property)->value = value->value;`
`3473`	`3473`	`if (Z_REFCOUNT_P(value) > 0) {`
`3474`	`3474`	`zval_copy_ctor(*property);`
	`3475`	`+ } else {`
	`3476`	`+ efree(value);`
`3475`	`3477`	`}`
`3476`	`3478`	`} else {`
`3477`	`3479`	`zval garbage = property;`
Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,8 @@ static void zend_std_write_property(zval object, zval member, zval *value TSRM`
`437`	`437`	`(*variable_ptr)->value = value->value;`
`438`	`438`	`if (Z_REFCOUNT_P(value) > 0) {`
`439`	`439`	`zval_copy_ctor(*variable_ptr);`
	`440`	`+ } else {`
	`441`	`+ efree(value);`
`440`	`442`	`}`
`441`	`443`	`zval_dtor(&garbage);`
`442`	`444`	`} else {`