Skip to content

U
uniset2
Commit 4e4a16d1 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

fixed bug: SIGSIEGV!!!

parent deeab0b1
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
src/Various/Configuration.cc
View file @ 4e4a16d1
...@@ -325,9 +325,14 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -325,9 +325,14 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
if( unideb.debugging(Debug::INFO) ) if( unideb.debugging(Debug::INFO) )
unideb[Debug::INFO] << "(Configuration): " << param.str() << endl; unideb[Debug::INFO] << "(Configuration): " << param.str() << endl;
i+=2; i+=2;
assert( i < _argc ); assert( i < _argc );
} }
// .. _argc , _argv
// getArgParam SIGSEGV
_argv = new_argv;
// NameService (+2) // NameService (+2)
xmlNode* nsnode = getNode("NameService"); xmlNode* nsnode = getNode("NameService");
if( !nsnode ) if( !nsnode )
...@@ -339,8 +344,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv ) ...@@ -339,8 +344,8 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
else else
{ {
new_argv[i] = "-ORBInitRef"; new_argv[i] = "-ORBInitRef";
new_argv[i+1] = ""; // (.. getArgParam) new_argv[i+1] = ""; // (.. getArgParam)
string defPort( getPort( getProp(nsnode,"port") ) ); // getArgParam! _argv string defPort( getPort( getProp(nsnode,"port") ) ); // getArgParam! _argv
ostringstream param; ostringstream param;
...@@ -662,7 +667,7 @@ void Configuration::createNodesList() ...@@ -662,7 +667,7 @@ void Configuration::createNodesList()
} }
} }
tmp = getProp(it,"dbserver"); tmp = it.getProp("dbserver");
if( tmp.empty() ) if( tmp.empty() )
ninf.dbserver = UniSetTypes::DefaultObjectId; ninf.dbserver = UniSetTypes::DefaultObjectId;
......
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