Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmd

- Added error printout and nice exit for duplicate default sections
This commit is contained in:
tomas@poseidon.ndb.mysql.com 2005-10-10 12:25:29 +02:00
parent d8640ca222
commit 57978f52fc

View File

@ -565,8 +565,12 @@ InitConfigFileParser::storeSection(Context& ctx){
} }
} }
} }
if(ctx.type == InitConfigFileParser::DefaultSection) if(ctx.type == InitConfigFileParser::DefaultSection &&
require(ctx.m_defaults->put(ctx.pname, ctx.m_currentSection)); !ctx.m_defaults->put(ctx.pname, ctx.m_currentSection))
{
ctx.reportError("Duplicate default section not allowed");
return false;
}
if(ctx.type == InitConfigFileParser::Section) if(ctx.type == InitConfigFileParser::Section)
require(ctx.m_config->put(ctx.pname, ctx.m_currentSection)); require(ctx.m_config->put(ctx.pname, ctx.m_currentSection));
delete ctx.m_currentSection; ctx.m_currentSection = NULL; delete ctx.m_currentSection; ctx.m_currentSection = NULL;