Skip to content

Add NULL checks on bcb_bdb missing after CORE-6509 (4.0) #9294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrieleciech wants to merge 1 commit into
base: v4.0-release
Choose a base branch
from
+14 −1
Open

Add NULL checks on bcb_bdb missing after CORE-6509 (4.0) #9294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/jrd/cch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,8 @@ int CCH_down_grade_dbb(void* ast_object)
for (const bcb_repeat* const end = tail + bcb->bcb_count; tail < end; ++tail)
{
BufferDesc* bdb = tail->bcb_bdb;
if (!bdb) // first non-initialized BDB, abandon following checks
break;

// Acquire EX latch to avoid races with LCK_release (called by CCH_release)
// or LCK_lock (by lock_buffer) in main thread. Take extra care to avoid
Expand Down Expand Up @@ -1226,6 +1228,9 @@ void CCH_flush_ast(thread_db* tdbb)
for (ULONG i = 0; (bcb = dbb->dbb_bcb) && i < bcb->bcb_count; i++)
{
BufferDesc* bdb = bcb->bcb_rpt[i].bcb_bdb;
if (!bdb) // first non-initialized BDB, abandon following checks
break;

if (bdb->bdb_flags & (BDB_dirty | BDB_db_dirty))
down_grade(tdbb, bdb, 1);
}
Expand Down Expand Up @@ -2162,6 +2167,8 @@ void CCH_shutdown(thread_db* tdbb)
for (; tail < end; tail++)
{
BufferDesc* const bdb = tail->bcb_bdb;
if (!bdb) // first non-initialized BDB, abandon following checks
break;

if (dbb->dbb_flags & DBB_bugcheck)
{
Expand Down Expand Up @@ -4065,7 +4072,13 @@ static ULONG get_prec_walk_mark(BufferControl* bcb)
if (++bcb->bcb_prec_walk_mark == 0)
{
for (ULONG i = 0; i < bcb->bcb_count; i++)
bcb->bcb_rpt[i].bcb_bdb->bdb_prec_walk_mark = 0;
{
BufferDesc* bdb = bcb->bcb_rpt[i].bcb_bdb;
if (!bdb) // first non-initialized BDB, abandon following checks
break;

bdb->bdb_prec_walk_mark = 0;
}

bcb->bcb_prec_walk_mark = 1;
}
Expand Down
Loading