Bug #12043, do not core on misconfig unless debug compiled

parent 29dc2696
...@@ -2136,7 +2136,17 @@ const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo); ...@@ -2136,7 +2136,17 @@ const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
/**************************************************************************** /****************************************************************************
* Ctor * Ctor
****************************************************************************/ ****************************************************************************/
static void require(bool v) { if(!v) abort();} static void require(bool v)
{
if(!v)
{
#ifndef DBUG_OFF
abort();
#else
exit(-1);
#endif
}
}
ConfigInfo::ConfigInfo() ConfigInfo::ConfigInfo()
: m_info(true), m_systemDefaults(true) : m_info(true), m_systemDefaults(true)
...@@ -2277,7 +2287,7 @@ ConfigInfo::ConfigInfo() ...@@ -2277,7 +2287,7 @@ ConfigInfo::ConfigInfo()
****************************************************************************/ ****************************************************************************/
inline void warning(const char * src, const char * arg){ inline void warning(const char * src, const char * arg){
ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl; ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl;
abort(); require(false);
} }
const Properties * const Properties *
...@@ -3394,7 +3404,7 @@ fixDepricated(InitConfigFileParser::Context & ctx, const char * data){ ...@@ -3394,7 +3404,7 @@ fixDepricated(InitConfigFileParser::Context & ctx, const char * data){
} }
case PropertiesType_Properties: case PropertiesType_Properties:
default: default:
abort(); ::require(false);
} }
} }
return true; return true;
...@@ -3406,7 +3416,7 @@ static bool ...@@ -3406,7 +3416,7 @@ static bool
saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
const Properties * sec; const Properties * sec;
if(!ctx.m_currentInfo->get(ctx.fname, &sec)){ if(!ctx.m_currentInfo->get(ctx.fname, &sec)){
abort(); require(false);
return false; return false;
} }
...@@ -3477,7 +3487,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){ ...@@ -3477,7 +3487,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
break; break;
} }
default: default:
abort(); require(false);
} }
require(ok); require(ok);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment