Merge branch 'testing' into clang-profile-build

engine/server/library/serverDatabase/src/shared/Persister.cpp

@@ -604,8 +604,6 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
 	{
 		m_savingSnapshots.erase(i, m_savingSnapshots.end());
 
-		delete completedSnapshot;
-
 		if (m_savingSnapshots.empty() && ConfigServerDatabase::getReportSaveTimes())
 		{
 			int saveTime = Clock::timeMs() - m_saveStartTime;
@@ -637,10 +635,16 @@ void Persister::saveCompleted(Snapshot *completedSnapshot)
 	{
 		SnapshotListType::iterator j=std::remove(m_savingCharacterSnapshots.begin(),m_savingCharacterSnapshots.end(),completedSnapshot);
 DEBUG_FATAL(i==m_savingCharacterSnapshots.end(),("Programmer bug:  SaveCompleted() called with a snapshot that wasn't in m_savingSnapshots or m_savingCharacterSnapshots."));
-		m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
-		delete completedSnapshot;
+        m_savingCharacterSnapshots.erase(j, m_savingCharacterSnapshots.end());
 		DEBUG_REPORT_LOG(ConfigServerDatabase::getReportSaveTimes(),("New character save completed\n"));
 	}
+
+    if (completedSnapshot) {
+        delete completedSnapshot;
+        completedSnapshot = nullptr; // in case of double deletes by any other pointers to this thing
+    } else {
+        DEBUG_WARNING(true, ("We just attempted a double delete!"));
+    }
 }
 
 // ----------------------------------------------------------------------

external/3rd/library/webAPI/webAPIHeartbeat.cpp

@@ -9,8 +9,7 @@ using namespace StellaBellum;
 webAPIHeartbeat::webAPIHeartbeat() {
     std::string filePath = this->get_selfpath();
 
-    webAPI api = webAPI::webAPI(
-            std::string(vxENCRYPT("https://login.stellabellum.net/metric/shoulderTap").decrypt()),
+    webAPI api(std::string(vxENCRYPT("https://login.stellabellum.net/metric/shoulderTap").decrypt()),
             std::string(vxENCRYPT("StellaBellum WebAPI Metrics Sender").decrypt()));
     api.addJsonData<std::string>(std::string(vxENCRYPT("type").decrypt()), std::string(vxENCRYPT("server").decrypt()));