Fix a reference leak in collections.RBTree.__root__

GrieferAtWork · Nov 11, 2023 · 17d2e96 · 17d2e96
1 parent 821024d
commit 17d2e96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/dex/collections/rbtree.c b/src/dex/collections/rbtree.c
@@ -1120,8 +1120,6 @@ rbtree_iter(RBTree *__restrict self) {
 	result = DeeObject_MALLOC(RBTreeIterator);
 	if unlikely(!result)
 		goto done;
-	result->rbti_tree = self;
-	Dee_Incref(self);
 	RBTree_LockRead(self);
 	result->rbti_version = self->rbt_version;
 	result->rbti_next    = self->rbt_root;
@@ -1131,6 +1129,8 @@ rbtree_iter(RBTree *__restrict self) {
 			result->rbti_next = result->rbti_next->rbtn_lhs;
 	}
 	RBTree_LockEndRead(self);
+	result->rbti_tree = self;
+	Dee_Incref(self);
 	DeeObject_Init(result, &RBTreeIterator_Type);
 done:
 	return result;
@@ -3030,14 +3030,14 @@ rbtree_get_itroot(RBTree *__restrict self) {
 	result = DeeObject_MALLOC(RBTreeIterator);
 	if unlikely(!result)
 		goto done;
-	result->rbti_tree = self;
-	Dee_Incref(self);
 	RBTree_LockRead(self);
 	if unlikely(!self->rbt_root)
 		goto err_r_unlock_empty;
 	result->rbti_next    = self->rbt_root;
 	result->rbti_version = self->rbt_version;
 	RBTree_LockEndRead(self);
+	result->rbti_tree = self;
+	Dee_Incref(self);
 	DeeObject_Init(result, &RBTreeIterator_Type);
 done:
 	return result;

diff --git a/util/test-errors.dee b/util/test-errors.dee
@@ -276,8 +276,8 @@ function invokeTypeMembers(t: Type) {
 			continue;
 		local wrapper = t.operator . (a.name);
 		if (wrapper is Callable) {
-			//print(f"invokeAsync({repr wrapper});");
-			invoke(wrapper, name: f"{repr t}.{a.name}");
+			print(f"invokeAsync({repr wrapper});");
+			//invoke(wrapper, name: f"{repr t}.{a.name}");
 		}
 	}
 }
@@ -308,8 +308,7 @@ function main() {
 	//invokeTypeMembers((UniqueDict from collections).Frozen);
 	//invokeTypeMembers((UniqueSet from collections));
 	//invokeTypeMembers((UniqueSet from collections).Frozen);
-	// FIXME: This leaks references somewhere
-	invokeTypeMembers(RBTree from collections);
+	//invokeTypeMembers(RBTree from collections);
 }