]> granicus.if.org Git - php/commitdiff
Fixed tests/run-test/test009.phpt
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 11:48:56 +0000 (15:48 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 11:48:56 +0000 (15:48 +0400)
Zend/zend_object_handlers.c
Zend/zend_objects_API.c

index bf688df65f4ed4c6498490bf46f8ddc779b467f7..bbda58cff9d6e9354b7fcc68d3e822223756e8c8 100644 (file)
@@ -1604,7 +1604,7 @@ int zend_std_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function **f
 
 ZEND_API zend_object_handlers std_object_handlers = {
        zend_object_free,                                               /* free_obj */
-       zend_object_std_dtor,                                   /* dtor_obj */
+       zend_objects_destroy_object,                    /* dtor_obj */
        zend_objects_clone_obj,                                 /* clone_obj */
 
        zend_std_read_property,                                 /* read_property */
index 8e406ec71540df72dddf8b9cf194a5cc73d9d139..6f80771ce6a6fae7f0831ed068329ecacba313c6 100644 (file)
@@ -129,7 +129,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */
         */
        if (EG(objects_store).object_buckets &&
            IS_VALID(EG(objects_store).object_buckets[object->handle])) {
-               if (object->gc.refcount == 1) {
+               if (object->gc.refcount == 0) {
                        int failure = 0;
 
                        if (!(object->gc.u.v.flags & IS_OBJ_DESTRUCTOR_CALLED)) {
@@ -146,7 +146,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */
                                }
                        }
                        
-                       if (object->gc.refcount == 1) {
+                       if (object->gc.refcount == 0) {
                                zend_uint handle = object->handle;
 
 //???                          GC_REMOVE_ZOBJ_FROM_BUFFER(obj);