PublicArchive/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2026-05-06 07:56:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove first manual memory allocation in ObjectRepository::SaveObject

Browse Source
This commit is contained in:
mix
2026-05-02 12:51:46 +01:00
parent 2d36d7dfdf
commit b09dc06a41
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openrct2/object/ObjectRepository.cpp
+8 -9
View File
@@ -489,15 +489,16 @@ namespace OpenRCT2
const auto extraBytes = calculateExtraBytesToFixChecksum(realChecksum, entry->checksum);
// Create new data blob with appended bytes
size_t newDataSize = dataSize + extraBytes.size();
uint8_t* newData = Memory::Allocate<uint8_t>(newDataSize);
uint8_t* newDataSaltOffset = newData + dataSize;
std::copy_n(static_cast<const uint8_t*>(data), dataSize, newData);
std::copy_n(extraBytes.data(), extraBytes.size(), newDataSaltOffset);
std::vector<uint8_t> newData;
newData.reserve(dataSize + extraBytes.size());
const auto dataSpan = std::span(static_cast<const uint8_t*>(data), dataSize);
newData.insert(newData.end(), dataSpan.begin(), dataSpan.end());
newData.insert(newData.end(), extraBytes.begin(), extraBytes.end());
try
{
uint32_t newRealChecksum = ObjectCalculateChecksum(entry, newData, newDataSize);
uint32_t newRealChecksum = ObjectCalculateChecksum(entry, newData.data(), newData.size());
if (newRealChecksum != entry->checksum)
{
Console::Error::WriteLine("CalculateExtraBytesToFixChecksum failed to fix checksum.");
@@ -508,13 +509,11 @@ namespace OpenRCT2
else
{
// Save new data form
SaveObject(path, entry, newData, newDataSize, false);
SaveObject(path, entry, newData.data(), newData.size(), false);
}
Memory::Free(newData);
}
catch (const std::exception&)
{
Memory::Free(newData);
throw;
}
return;