minenux/minetest-engine-minetest
minenux/minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Fix get_server_status() segfault due to uninitialized m_env

Browse Source 
Fixes #7857
This commit is contained in:
rubenwardy 2018-11-12 14:34:01 +00:00 committed by luk3yx
parent 8fe5db2301
commit 15da50c815
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/server.cpp
View File

@ -334,7 +334,7 @@ Server::~Server()
{ {
MutexAutoLock envlock(m_env_mutex); MutexAutoLock envlock(m_env_mutex);
infostream << "Server: Saving players" << std::endl; infostream << "Server: Saving players" << std::endl;
m_env->saveLoadedPlayers(); m_env->saveLoadedPlayers();
@ -3013,36 +3013,44 @@ PlayerSAO* Server::getPlayerSAO(u16 peer_id)
std::wstring Server::getStatusString() std::wstring Server::getStatusString()
{ {
std::wostringstream os(std::ios_base::binary); std::wostringstream os(std::ios_base::binary);
os<<L"# Server: "; os << L"# Server: ";
// Version // Version
os<<L"version="<<narrow_to_wide(g_version_string); os << L"version=" << narrow_to_wide(g_version_string);
// Uptime // Uptime
os<<L", uptime="<<m_uptime.get(); os << L", uptime=" << m_uptime.get();
// Max lag estimate // Max lag estimate
os<<L", max_lag="<<m_env->getMaxLagEstimate(); os << L", max_lag=" << (m_env ? m_env->getMaxLagEstimate() : 0);
// Information about clients // Information about clients
bool first = true; bool first = true;
os<<L", clients={"; os << L", clients={";
std::vector<u16> clients = m_clients.getClientIDs(); if (m_env) {
for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) { std::vector<session_t> clients = m_clients.getClientIDs();
// Get player for (session_t client_id : clients) {
RemotePlayer *player = m_env->getPlayer(*i); RemotePlayer *player = m_env->getPlayer(client_id);
// Get name of player
std::wstring name = L"unknown"; // Get name of player
if (player != NULL) std::wstring name = L"unknown";
name = narrow_to_wide(player->getName()); if (player)
// Add name to information string name = narrow_to_wide(player->getName());
if(!first)
os << L", "; // Add name to information string
else if (!first)
first = false; os << L", ";
os << name; else
first = false;
os << name;
}
} }
os << L"}"; os << L"}";
if(((ServerMap*)(&m_env->getMap()))->isSavingEnabled() == false)
os<<std::endl<<L"# Server: "<<" WARNING: Map saving is disabled."; if (m_env && !((ServerMap*)(&m_env->getMap()))->isSavingEnabled())
if(g_settings->get("motd") != "") os << std::endl << L"# Server: " << " WARNING: Map saving is disabled.";
os<<std::endl<<L"# Server: "<<narrow_to_wide(g_settings->get("motd"));
if (!g_settings->get("motd").empty())
os << std::endl << L"# Server: " << narrow_to_wide(g_settings->get("motd"));
return os.str(); return os.str();
} }
@ -3577,7 +3585,7 @@ void Server::requestShutdown(const std::string &msg, bool reconnect, float delay
if (delay == 0.0f) { if (delay == 0.0f) {
// No delay, shutdown immediately // No delay, shutdown immediately
m_shutdown_requested = true; m_shutdown_requested = true;
// only print to the infostream, a chat message saying // only print to the infostream, a chat message saying
// "Server Shutting Down" is sent when the server destructs. // "Server Shutting Down" is sent when the server destructs.
infostream << "*** Immediate Server shutdown requested." << std::endl; infostream << "*** Immediate Server shutdown requested." << std::endl;
} else if (delay < 0.0f && m_shutdown_timer > 0.0f) { } else if (delay < 0.0f && m_shutdown_timer > 0.0f) {