Use the old association policy to determine whether to release an object

This commit has been augmented to address the comments in df7f906
microsoft · Jan 22, 2018 · 0b2cfdc · 0b2cfdc
1 parent 7a226d8
commit 0b2cfdc
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/associate.m b/associate.m
@@ -166,12 +166,17 @@ static void setReference(struct reference_list *list,
 		lock = lock_for_pointer(r);
 		lock_spinlock(lock);
 	}
-	r->policy = policy;
-	id old = r->object;
-	r->object = obj;
-	if (OBJC_ASSOCIATION_ASSIGN != r->policy)
+	@try
 	{
-		objc_release(old);
+		if (OBJC_ASSOCIATION_ASSIGN != r->policy)
+		{
+			objc_release(r->object);
+		}
+	}
+	@finally
+	{
+		r->policy = policy;
+		r->object = obj;
 	}
 	if (needLock)
 	{