Skip to content

Guard Amiga hill sprite copy against short buffers #114

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
Merged

Guard Amiga hill sprite copy against short buffers #114

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
7 changes: 7 additions & 0 deletions Source/Amiga/Graphics_Amiga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,13 @@ void cGraphics_Amiga::Load_Hill_Data() {
mImageHillSprites = Decode_Image("hills", 64);
mImageHillSprites.mData->resize(mImageHillBackground.GetHeader()->ScreenSize() * (mImageHillBackground.GetHeader()->mPlanes + 30));

// Legacy code below writes to fixed offsets in the hill sprite buffer.
// Ensure the decoded image is large enough before using those offsets.
constexpr size_t kHillSpriteMinSize = 0x42A0E;
if (mImageHillSprites.mData->size() < kHillSpriteMinSize) {
return;
}

// A5A7E
uint8* a0 = mImageHillSprites.mData->data() + (29 * 40);
uint8* a1 = mImageHillSprites.mData->data() + 0x390EE + 0x3E8;
Expand Down
Loading