Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: nullptr access for logger in master (#1380)

Browse Source 
* fix nullptr access for logger

* fix nullptr access for logger

fix no save on crash

* Update MasterServer.cpp
This commit is contained in:
David Markowitz 2024-01-02 16:28:17 -08:00 committed by GitHub
parent b1134b340f
commit bb79528c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dMasterServer/MasterServer.cpp
View File

@ -812,6 +812,7 @@ void HandlePacket(Packet* packet) {
} }
int ShutdownSequence(int32_t signal) { int ShutdownSequence(int32_t signal) {
if (!Game::logger) return -1;
LOG("Recieved Signal %d", signal); LOG("Recieved Signal %d", signal);
if (shutdownSequenceStarted) { if (shutdownSequenceStarted) {
LOG("Duplicate Shutdown Sequence"); LOG("Duplicate Shutdown Sequence");
@ -900,9 +901,13 @@ int32_t FinalizeShutdown(int32_t signal) {
//Delete our objects here: //Delete our objects here:
Database::Destroy("MasterServer"); Database::Destroy("MasterServer");
if (Game::config) delete Game::config; if (Game::config) delete Game::config;
Game::config = nullptr;
if (Game::im) delete Game::im; if (Game::im) delete Game::im;
Game::im = nullptr;
if (Game::server) delete Game::server; if (Game::server) delete Game::server;
Game::server = nullptr;
if (Game::logger) delete Game::logger; if (Game::logger) delete Game::logger;
Game::logger = nullptr;
if (signal != EXIT_SUCCESS) exit(signal); if (signal != EXIT_SUCCESS) exit(signal);
return signal; return signal;

5
dWorldServer/WorldServer.cpp
View File

@ -1291,14 +1291,17 @@ void WorldShutdownProcess(uint32_t zoneId) {
} }
void WorldShutdownSequence() { void WorldShutdownSequence() {
bool shouldShutdown = Game::ShouldShutdown() || worldShutdownSequenceComplete;
Game::lastSignal = -1; Game::lastSignal = -1;
#ifndef DARKFLAME_PLATFORM_WIN32 #ifndef DARKFLAME_PLATFORM_WIN32
if (Game::ShouldShutdown() || worldShutdownSequenceComplete) if (shouldShutdown)
#endif #endif
{ {
return; return;
} }
if (!Game::logger) return;
LOG("Zone (%i) instance (%i) shutting down outside of main loop!", Game::server->GetZoneID(), instanceID); LOG("Zone (%i) instance (%i) shutting down outside of main loop!", Game::server->GetZoneID(), instanceID);
WorldShutdownProcess(Game::server->GetZoneID()); WorldShutdownProcess(Game::server->GetZoneID());
FinalizeShutdown(); FinalizeShutdown();