com php-src: Fixed memroy errors with valgrind: Zend/zend_obj ects.c
| From: | Xinchen Hui | Date: | Mon, 29 Jun 2015 07:36:02 +0000 |
| Subject: | com php-src: Fixed memroy errors with valgrind: Zend/zend_obj ects.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87600@lists.php.net to get a copy of this message | ||
Commit: 4cc0096e0074a096c03b7f1d1cf3f27b62d5dfa1
Author: Xinchen Hui <laruence@php.net> Mon, 29 Jun 2015 15:36:02 +0800
Parents: a5d38e0deabe0e5b2edcb0255fc921f6be489cbd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4cc0096e0074a096c03b7f1d1cf3f27b62d5dfa1
Log:
Fixed memroy errors with valgrind
Changed paths:
M Zend/zend_objects.c
Diff:
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 2a0655b..91bb603 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -57,6 +57,8 @@ ZEND_API void zend_object_std_dtor(zend_object *object)
if (object->properties) {
if (EXPECTED(!(GC_FLAGS(object->properties) & IS_ARRAY_IMMUTABLE))) {
if (EXPECTED(--GC_REFCOUNT(object->properties) == 0)) {
+ GC_REMOVE_FROM_BUFFER(object->properties);
+ GC_TYPE_INFO(object->properties) = IS_NULL | (GC_WHITE << 16);
zend_array_destroy(object->properties);
}
}