mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Replace assertions in DecodeChunkRLEWithSize() (#22061)

Browse Source
This commit is contained in:
Michael Steenbeek
2024-05-19 16:15:18 +02:00
committed by GitHub
parent 2217d401c1
commit eaba5f356c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,8 +219,9 @@ static size_t DecodeChunkRLEWithSize(const uint8_t* src_buffer, uint8_t* dst_buf
dst = dst_buffer;
assert(length > 0);
assert(dstSize > 0);
if (length <= 0 || dstSize <= 0)
throw std::out_of_range("Invalid RLE string!");
for (size_t i = 0; i < length; i++)
{
rleCodeByte = src_buffer[i];
@@ -235,8 +236,8 @@ static size_t DecodeChunkRLEWithSize(const uint8_t* src_buffer, uint8_t* dst_buf
}
else
{
assert(dst + rleCodeByte + 1 <= dst_buffer + dstSize);
assert(i + 1 < length);
if ((dst + rleCodeByte + 1 > dst_buffer + dstSize) || (i + 1 >= length))
throw std::out_of_range("Invalid RLE string!");
std::memcpy(dst, src_buffer + i + 1, rleCodeByte + 1);
dst = reinterpret_cast<uint8_t*>(reinterpret_cast<uintptr_t>(dst) + rleCodeByte + 1);
i += rleCodeByte + 1;