mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11216] Fixed crash at explictly empty string setting for dataDir in mangosd.conf.

Browse source
This commit is contained in:
VladimirMangos 2011-03-03 22:06:11 +03:00
parent 06fe777f82
commit 5a3f557b19
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/World.cpp
View file

@ -839,19 +839,24 @@ void World::LoadConfigSettings(bool reload)
setConfigPos(CONFIG_UINT32_CHARDELETE_KEEP_DAYS, "CharDelete.KeepDays", 30); setConfigPos(CONFIG_UINT32_CHARDELETE_KEEP_DAYS, "CharDelete.KeepDays", 30);
///- Read the "Data" directory from the config file ///- Read the "Data" directory from the config file
std::string dataPath = sConfig.GetStringDefault("DataDir","./"); std::string dataPath = sConfig.GetStringDefault("DataDir", "./");
if( dataPath.at(dataPath.length()-1)!='/' && dataPath.at(dataPath.length()-1)!='\\' )
// for empty string use current dir as for absent case
if (dataPath.empty())
dataPath = "./";
// normalize dir path to path/ or path\ form
else if (dataPath.at(dataPath.length()-1) != '/' && dataPath.at(dataPath.length()-1) != '\\')
dataPath.append("/"); dataPath.append("/");
if(reload) if (reload)
{ {
if(dataPath!=m_dataPath) if (dataPath != m_dataPath)
sLog.outError("DataDir option can't be changed at mangosd.conf reload, using current value (%s).",m_dataPath.c_str()); sLog.outError("DataDir option can't be changed at mangosd.conf reload, using current value (%s).", m_dataPath.c_str());
} }
else else
{ {
m_dataPath = dataPath; m_dataPath = dataPath;
sLog.outString("Using DataDir %s",m_dataPath.c_str()); sLog.outString("Using DataDir %s", m_dataPath.c_str());
} }
setConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK, "vmap.enableIndoorCheck", true); setConfig(CONFIG_BOOL_VMAP_INDOOR_CHECK, "vmap.enableIndoorCheck", true);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11215" #define REVISION_NR "11216"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__