Skip to content

[pull] master from beyond-all-reason:master #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 26, 2026
Merged

[pull] master from beyond-all-reason:master #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions rts/Game/Game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,12 @@ void CGame::KillSimulation()
RECOIL_DETAILED_TRACY_ZONE;
LOG("[Game::%s][1]", __func__);

// a failed load leaves half-initialized objects behind, freeing them crashes
if (spring::exitCode == spring::EXIT_CODE_NOLOAD && gu->globalQuit) {
LOG_L(L_WARNING, "[Game::%s] simulation never finished loading, leaking it", __func__);
return;
}

// Kill all teams that are still alive, in
// case the game did not do so through Lua.
//
Expand Down
19 changes: 14 additions & 5 deletions rts/System/creg/Serializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "System/Log/ILog.h"
#include "System/Platform/byteorder.h"
#include "System/Exceptions.h"
#include "System/StringUtil.h"

#include <algorithm>
#include <fstream>
Expand Down Expand Up @@ -415,11 +416,9 @@ CInputStreamSerializer::CInputStreamSerializer()

CInputStreamSerializer::~CInputStreamSerializer()
{
for (StoredObject& o: objects) {
if (o.obj) {
classRefs[o.classRef]->DeleteInstance(o.obj);
}
}
// the entries are live or half-initialized objects, deleting either crashes
if (!objects.empty())
LOG_L(L_WARNING, "[creg::%s] load failed, leaking %d partially loaded objects", __func__, int(objects.size()));
}

bool CInputStreamSerializer::IsWriting()
Expand Down Expand Up @@ -476,6 +475,8 @@ void CInputStreamSerializer::SerializeObjectPtr(void** ptr, creg::Class* cls)
{
unsigned int id;
ReadVarSizeUInt(stream, &id);
if (id >= objects.size())
throw content_error("Save corrupted: object reference " + IntToString(id) + " out of range (" + IntToString(objects.size()) + " objects)");
if (id) {
StoredObject& o = objects [id];
if (o.obj) *ptr = o.obj;
Expand All @@ -501,7 +502,13 @@ void CInputStreamSerializer::SerializeObjectInstance(void* inst, creg::Class* cl
if (id == 0)
return; // this is old save game and it has not this object - skip it

if (id >= objects.size())
throw content_error("Save corrupted: instance reference " + IntToString(id) + " out of range (" + IntToString(objects.size()) + " objects)");

StoredObject& o = objects[id];
creg::Class* fileCls = classRefs[o.classRef];
if (fileCls != cls)
throw content_error(std::string("Save incompatible: file contains ") + fileCls->name + " where " + cls->name + " was expected (the save was made with different settings)");
assert(!o.obj);
assert(o.isEmbedded);

Expand Down Expand Up @@ -637,6 +644,8 @@ void CInputStreamSerializer::LoadPackage(std::istream* s, void*& root, creg::Cla

creg::Class* cls = classRefs[object.classRef];
SerializeObject(cls, object.obj);
if (stream->fail())
throw content_error(std::string("Save corrupted: stream exhausted while reading ") + cls->name);
LOG_SL(LOG_SECTION_CREG_SERIALIZER, L_DEBUG, "Deserialized %s size:%i", cls->name, cls->size);
}

Expand Down