Skip to content

Fix RNC fail-open path and palette bounds compile error #127

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
segrax merged 1 commit into from
May 24, 2026
+5 −3
Merged

Fix RNC fail-open path and palette bounds compile error #127

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
3 changes: 2 additions & 1 deletion Source/Amiga/Graphics_Amiga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,8 @@ sImage cGraphics_Amiga::DecodeIFF(const std::string& pFilename) {
d0 = (int16)d0;
Final += d0;

if (i < std::size(Result.mPalette)) {
const size_t PaletteCapacity = sizeof(Result.mPalette) / sizeof(Result.mPalette[0]);
if (i < PaletteCapacity) {
Result.mPalette[i].mRed = ((Final >> 8) & 0xF) << 2;
Result.mPalette[i].mGreen = ((Final >> 4) & 0xF) << 2;
Result.mPalette[i].mBlue = ((Final >> 0) & 0xF) << 2;
Expand Down
5 changes: 3 additions & 2 deletions Source/Resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ tSharedBuffer cResources::fileGet( std::string pFilename ) {
tSharedBuffer cResources::fileDeRNC(tSharedBuffer pBuffer) {
constexpr uint32 RNCHeaderSize = 18;
constexpr uint32 MaxUnpackedSize = 64 * 1024 * 1024;
const auto InvalidRNC = []() { return std::make_shared<std::vector<uint8>>(); };

if (pBuffer->size() < RNCHeaderSize)
return pBuffer;
Expand All @@ -52,14 +53,14 @@ tSharedBuffer cResources::fileDeRNC(tSharedBuffer pBuffer) {
uint32 PackedSize = readBEDWord(pBuffer->data() + 8);

if ((PackedSize > (pBuffer->size() - RNCHeaderSize)) || !Size || (Size > MaxUnpackedSize))
return pBuffer;
return InvalidRNC();

auto Unpacked = std::make_shared<std::vector<uint8>>();
Unpacked->resize(Size);

long Result = rnc_unpack(pBuffer->data(), Unpacked->data());
if (Result != static_cast<long>(Size))
return pBuffer;
return InvalidRNC();

return Unpacked;
}
Expand Down
Loading