Skip to content

Fixed potential endless loop inside MET_scan_relation #8826

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

Merged
hvlad merged 2 commits into from
Dec 16, 2025
+25 −0
Merged

Fixed potential endless loop inside MET_scan_relation #8826

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8597483
Fixed potential endless loop inside MET_scan_relation: when relation …
hvlad Dec 15, 2025
9ca15be
Relaxed check as @dyemanov suggested
hvlad Dec 15, 2025
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
25 changes: 25 additions & 0 deletions src/jrd/met.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4095,9 +4095,13 @@ static void scan_relation(thread_db* tdbb, jrd_rel* relation)
AutoCacheRequest request(tdbb, irq_r_fields, IRQ_REQUESTS);
CompilerScratch* csb = NULL;

bool found = false;

FOR(REQUEST_HANDLE request)
REL IN RDB$RELATIONS WITH REL.RDB$RELATION_ID EQ relation->rel_id
{
found = true;

// Pick up relation level stuff
relation->rel_current_fmt = REL.RDB$FORMAT;
vec<jrd_fld*>* vector = relation->rel_fields =
Expand Down Expand Up @@ -4371,6 +4375,27 @@ static void scan_relation(thread_db* tdbb, jrd_rel* relation)

delete csb;

if (!found && !(relation->rel_flags & REL_scanned))
{
// Relation was not found in RDB$RELATIONS. It could be system virtual relation
// defined in INI.

if (relation->isSystem() && relation->isVirtual())
{
relation->rel_flags |= REL_scanned;
}
else
{
fb_assert(false);

string name(relation->rel_name);
if (name.isEmpty())
name.printf("<ID = %u>", relation->rel_id);

ERR_post(Arg::Gds(isc_relnotdef) << Arg::Str(name));
}
}

// We have just loaded the triggers onto the local vector triggers.
// It's now time to place them at their rightful place inside the relation block.

Expand Down
Loading