Skip to content

Reject overflowing Naomi LST ranges #2521

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

Open
acts-1631 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reject overflowing Naomi LST ranges #2521

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
8 changes: 7 additions & 1 deletion core/hw/naomi/naomi_cart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,16 @@ static void loadDecryptedRom(const std::string& path, const std::string& fileNam
u32 addr, sz;
if (sscanf(line, "\"%[^\"]\",%x,%x", filename, &addr, &sz) == 3)
{
u64 rangeEnd = (u64)addr + sz;
if (rangeEnd > 0xffffffffu)
{
delete fl;
throw FlycastException(Ts("Error: Invalid LST file range"));
}
files.emplace_back(filename);
fstart.push_back(addr);
fsize.push_back(sz);
romSize = std::max(romSize, (addr + sz));
romSize = std::max(romSize, (u32)rangeEnd);
}
else if (line[0] != 0 && line[0] != '\n' && line[0] != '\r')
WARN_LOG(NAOMI, "Warning: invalid line in .lst file: %s", line);
Expand Down
Loading