mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 08:45:00 +01:00
Code Issues Releases Wiki Activity

Fix #17053: Crash when trying to open files under 4 bytes in length

Browse Source
This commit is contained in:
Michael Steenbeek
2022-09-28 03:08:27 +02:00
committed by GitHub
parent 7bb7d97bdc
commit 3c11e04b52
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/util/SawyerCoding.cpp
View File

@@ -16,6 +16,7 @@
#include <algorithm>
#include <cstring>
#include <stdexcept>
static size_t decode_chunk_rle(const uint8_t* src_buffer, uint8_t* dst_buffer, size_t length);
static size_t decode_chunk_rle_with_size(const uint8_t* src_buffer, uint8_t* dst_buffer, size_t length, size_t dstSize);
@@ -152,6 +153,9 @@ size_t sawyercoding_encode_td6(const uint8_t* src, uint8_t* dst, size_t length)
/* Based off of rct2: 0x006770C1 */
int32_t sawyercoding_validate_track_checksum(const uint8_t* src, size_t length)
{
if (length < 4)
return 0;
uint32_t file_checksum = *(reinterpret_cast<const uint32_t*>(&src[length - 4]));
uint32_t checksum = 0;
@@ -384,6 +388,11 @@ static void encode_chunk_rotate(uint8_t* buffer, size_t length)
int32_t sawyercoding_detect_file_type(const uint8_t* src, size_t length)
{
if (length < 4)
{
throw std::length_error("Stream is (nearly) empty!");
}
size_t i;
// Currently can't detect TD4, as the checksum is the same as SC4 (need alternative method)