Changeset 17946

Timestamp:

10/06/08 10:38:25 (2 months ago)

Author:

piotras

Message:

Check if there's property of object type and *then* call object_std_dtor

Files:

• branches/branch-1-9/midgard/apis/php5/php_midgard_gobject_generic.c (modified) (3 diffs)

branches/branch-1-9/midgard/apis/php5/php_midgard_gobject_generic.c

@@ -706 +706 @@
-        zval **zvalue = NULL;
-        HashTable *props = zo->properties;
-
+
-        zend_hash_internal_pointer_reset_ex(props, &iterator);
-        while (zend_hash_get_current_data_ex(props, (void **)&zvalue, &iterator) == SUCCESS) {
-
-                if((*zvalue)) {
-       
-
+
+   
-                                zval_ptr_dtor(zvalue);
-                        }
@@ -735 +735 @@
-                return;
-
-        zend_object_std_dtor(&php_gobject->zo TSRMLS_CC);
-
-        if(php_gobject->gobject == NULL) {
-                
@@ -745 +743 @@
-
-                if(G_IS_OBJECT(php_gobject->gobject)) {
-//
+
-                        g_object_unref(G_OBJECT(php_gobject->gobject));
-                        php_gobject->gobject = NULL;
-                }
-        }
+
+        zend_object_std_dtor(&php_gobject->zo TSRMLS_CC);
-
-        php_gobject->gobject = NULL;