firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 23:23:04 +01:00
Code Issues

Fixed bug CORE-5257 : Enable nested keys in plugin configuration

Browse Source 
Alex, please review
This commit is contained in:
hvlad 2016-10-24 23:19:00 +03:00
parent c2812e739c
commit 2825af99a5
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/config/config_file.cpp
View File

@ -616,6 +616,7 @@ void ConfigFile::parse(Stream* stream)
switch (parseLine(streamName, inputLine, current))
{
case LINE_END_SUB:
case LINE_BAD:
badLine(streamName, inputLine);
return;
@ -643,16 +644,35 @@ void ConfigFile::parse(Stream* stream)
{ // subconf scope
SubStream subStream(stream->getFileName());
int level = 1;
while (getLine(stream, inputLine, line))
{
switch(parseLine(streamName, inputLine, current))
{
case LINE_END_SUB:
if (current.value.hasData())
subStream.putLine(current.value, line);
break;
case LINE_START_SUB:
fb_assert(level > 0);
level++;
subStream.putLine(inputLine, line);
continue;
case LINE_END_SUB:
level--;
if (level > 0)
{
subStream.putLine(inputLine, line);
continue;
}
else if (level == 0)
{
if (current.value.hasData())
subStream.putLine(current.value, line);
break;
}
else // level < 0 impossible
{
fb_assert(false);
}
//case LINE_START_SUB: will be ignored at next level. Ignore here?
case LINE_BAD:
badLine(streamName, inputLine);
return;
@ -664,6 +684,9 @@ void ConfigFile::parse(Stream* stream)
break;
}
if (level > 0)
badLine(streamName, "< missed closing bracket '}' >");
previous->sub = FB_NEW_POOL(getPool())
ConfigFile(getPool(), &subStream, flags);
}

2
src/yvalve/PluginManager.cpp
View File

@ -1109,7 +1109,7 @@ IConfig* PluginManager::getConfig(CheckStatusWrapper* status, const char* filena
try
{
IConfig* rc = FB_NEW ConfigAccess(RefPtr<ConfigFile>(
FB_NEW_POOL(*getDefaultMemoryPool()) ConfigFile(*getDefaultMemoryPool(), filename)));
FB_NEW_POOL(*getDefaultMemoryPool()) ConfigFile(*getDefaultMemoryPool(), filename, ConfigFile::HAS_SUB_CONF)));
rc->addRef();
return rc;
}