Fixed #8485: Segfault on incorrect databases.conf starting with subconfig

Author: AlexPeshkoff

src/common/config/config_file.cpp

@@ -669,14 +669,10 @@ void ConfigFile::parse(Stream* stream)
 		case LINE_END_SUB:
 		case LINE_BAD:
 			badLine(streamName, inputLine);
-			return;
 
 		case LINE_REGULAR:
 			if (current.name.isEmpty())
-			{
 				badLine(streamName, inputLine);
-				return;
-			}
 
 			previous = &parameters[parameters.add(current)];
 			break;
@@ -692,6 +688,9 @@ void ConfigFile::parse(Stream* stream)
 				previous = &parameters[n];
 			}
 
+			if (!previous)
+				badLine(streamName, "master parameter is missing before subconfig start '{'");
+
 			{ // subconf scope
 				SubStream subStream(stream->getFileName());
 				int level = 1;
@@ -725,7 +724,6 @@ void ConfigFile::parse(Stream* stream)
 
 					case LINE_BAD:
 						badLine(streamName, inputLine);
-						return;
 
 					default:
 						subStream.putLine(inputLine, line);
@@ -735,7 +733,7 @@ void ConfigFile::parse(Stream* stream)
 				}
 
 				if (level > 0)
-					badLine(streamName, "< missed closing bracket '}' >");
+					badLine(streamName, "missed closing bracket '}'");
 
 				previous->sub = FB_NEW_POOL(getPool())
 					ConfigFile(getPool(), &subStream, flags);

src/common/config/config_file.h

@@ -141,7 +141,7 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 	void parse(Stream* stream);
 	LineType parseLine(const char* fileName, const String& input, Parameter& par);
 	bool translate(const char* fileName, const String& from, String& to) const;
-	void badLine(const char* fileName, const String& line);
+	[[noreturn]] void badLine(const char* fileName, const String& line);
 	void include(const char* currentFileName, const Firebird::PathName& path);
 	bool wildCards(const char* currentFileName, const Firebird::PathName& pathPrefix, FilesArray& components);
 	bool substituteStandardDir(const String& from, String& to) const;