From 0c7bfb0022ad397e6370345c70d2c050d0cc3de2 Mon Sep 17 00:00:00 2001
From: Vlad Khorsun <hvlad@users.sourceforge.net>
Date: Mon, 14 Oct 2024 17:18:17 +0300
Subject: [PATCH] Fixed bug #8283 : Assert in ~thread_db() due to not released
 page buffer

---
 src/jrd/btr.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jrd/btr.cpp b/src/jrd/btr.cpp
index 5ff0a408b6..658fa0d7da 100644
--- a/src/jrd/btr.cpp
+++ b/src/jrd/btr.cpp
@@ -822,14 +822,16 @@ void BTR_all(thread_db* tdbb, jrd_rel* relation, IndexDescList& idxList, Relatio
 	if (!root)
 		return;
 
+	Cleanup release_root([&] {
+		CCH_RELEASE(tdbb, &window);
+	});
+
 	for (USHORT i = 0; i < root->irt_count; i++)
 	{
 		index_desc idx;
 		if (BTR_description(tdbb, relation, root, &idx, i))
 			idxList.add(idx);
 	}
-
-	CCH_RELEASE(tdbb, &window);
 }