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](https://github.com/minetest/minetest/issues/7857)
  minetest.get_server_status() causes a Segmentation fault
  tacken from 81d55338fa
* backported commit 13ad926546def65f01b5941ebb21493278189bea
This commit is contained in:
mckaygerhard 2023-01-05 16:41:15 -04:00
parent fa1d056316
commit 78d1c731e3
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/server.cpp
View File

@ -3019,29 +3019,32 @@ std::wstring Server::getStatusString()
// Uptime
os < <L", uptime=" << m_uptime.get();
// Max lag estimate
os<<L", max_lag="<<m_env->getMaxLagEstimate();
os << L", max_lag=" << (m_env ? m_env->getMaxLagEstimate() : 0);
// Information about clients
bool first = true;
os << L", clients={";
std::vector<u16> clients = m_clients.getClientIDs();
for (std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) {
// Get player
RemotePlayer *player = m_env->getPlayer(*i);
if (m_env) {
std::vector<session_t> clients = m_clients.getClientIDs();
for (session_t client_id : clients) {
RemotePlayer *player = m_env->getPlayer(client_id);
// Get name of player
std::wstring name = L"unknown";
if (player != NULL)
if (player)
name = narrow_to_wide(player->getName());
// Add name to information string
if (!first)
os << L", ";
else
first = false;
os << name;
}
os << L"}";
if(((ServerMap*)(&m_env->getMap()))->isSavingEnabled() == false)
if (m_env && !((ServerMap*)(&m_env->getMap()))->isSavingEnabled())
os << std::endl << L"# Server: " << " WARNING: Map saving is disabled.";
if(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();
}