Frontported pull request #8826: Fixed potential endless loop inside MET_scan_relation

Author: hvlad

src/jrd/met.epp

@@ -3973,12 +3973,16 @@ 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
 		CROSS SCH IN RDB$SCHEMAS
 		WITH REL.RDB$RELATION_ID EQ relation->rel_id AND
 			 SCH.RDB$SCHEMA_NAME EQ REL.RDB$SCHEMA_NAME
 	{
+		found = true;
+
 		// Pick up relation level stuff
 		relation->rel_current_fmt = REL.RDB$FORMAT;
 		vec<jrd_fld*>* vector = relation->rel_fields =
@@ -4251,6 +4255,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.toQuotedString());
+			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.
 	relation->replaceTriggers(tdbb, triggers);