Fixed bug #8283 : Assert in ~thread_db() due to not released page buffer

hvlad · hvlad · commit 421743d39256 · 2024-10-14T17:18:17.000+03:00
diff --git 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -822,14 +822,16 @@ void BTR_all(thread_db* tdbb, jrd_rel* relation, IndexDescList& idxList, Relatio`
`822`	`822`	`if (!root)`
`823`	`823`	`return;`
`824`	`824`
	`825`	`+ Cleanup release_root([&] {`
	`826`	`+ CCH_RELEASE(tdbb, &window);`
	`827`	`+ });`
	`828`	`+`
`825`	`829`	`for (USHORT i = 0; i < root->irt_count; i++)`
`826`	`830`	`{`
`827`	`831`	`index_desc idx;`
`828`	`832`	`if (BTR_description(tdbb, relation, root, &idx, i))`
`829`	`833`	`idxList.add(idx);`
`830`	`834`	`}`
`831`		`-`
`832`		`- CCH_RELEASE(tdbb, &window);`
`833`	`835`	`}`
`834`	`836`
`835`	`837`