mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix mismatched deleter in TryClassifyAsTD4_TD6

This commit is contained in:
Michał Janiszewski 2018-03-11 20:55:30 +01:00 committed by Michał Janiszewski
parent 74eddea1f1
commit 93041bbce5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/FileClassifier.cpp
View File

@ -140,12 +140,13 @@ static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFileInfo * result)
try
{
size_t dataLength = (size_t)stream->GetLength();
std::unique_ptr<uint8> data(stream->ReadArray<uint8>(dataLength));
auto deleter_lambda = [dataLength](uint8 * ptr) { Memory::FreeArray(ptr, dataLength); };
std::unique_ptr<uint8, decltype(deleter_lambda)> data(stream->ReadArray<uint8>(dataLength), deleter_lambda);
stream->SetPosition(originalPosition);
if (sawyercoding_validate_track_checksum(data.get(), dataLength))
{
std::unique_ptr<uint8>td6data(Memory::Allocate<uint8>(0x10000));
std::unique_ptr<uint8, decltype(&Memory::Free<uint8>)> td6data(Memory::Allocate<uint8>(0x10000), &Memory::Free<uint8>);
size_t td6len = sawyercoding_decode_td6(data.get(), td6data.get(), dataLength);
if (td6data != nullptr && td6len >= 8)
{