Skip to content

Clamp sprite limit inputs to prevent OOB and exhaustion #124

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

Clamp sprite limit inputs to prevent OOB and exhaustion #124

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
19 changes: 14 additions & 5 deletions Source/Parameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ using Json = nlohmann::json;
cxxopts::Options* sFodderParameters::mCliOptions = 0;

/* These values override the original engine values, when in custom mode */
const size_t CUSTOM_DEFAULT_MAX_SPRITES = 100000;
const size_t CUSTOM_DEFAULT_MAX_SPRITES = sFodderParameters::MAX_SPRITES_MAX;
const size_t CUSTOM_DEFAULT_MAX_SPAWN = 25;

std::string sFodderParameters::ToJson() {
Expand Down Expand Up @@ -90,8 +90,10 @@ bool sFodderParameters::FromJson(const std::string& pJson) {
else
mSpritesMax = 45; // The original engine limit

if (mSpritesMax < 16)
mSpritesMax = 16;
if (mSpritesMax < MIN_SPRITES_MAX)
mSpritesMax = MIN_SPRITES_MAX;
if (mSpritesMax > MAX_SPRITES_MAX)
mSpritesMax = MAX_SPRITES_MAX;
}

// Max Spawned
Expand Down Expand Up @@ -309,8 +311,10 @@ bool sFodderParameters::ProcessCLI(int argc, char *argv[]) {
if (result.count("max-spawn"))
mSpawnEnemyMax = result["max-spawn"].as<uint32_t>();

if (mSpritesMax < 16)
mSpritesMax = 16;
if (mSpritesMax < MIN_SPRITES_MAX)
mSpritesMax = MIN_SPRITES_MAX;
if (mSpritesMax > MAX_SPRITES_MAX)
mSpritesMax = MAX_SPRITES_MAX;

// Cheats perm enabled in debug build
#ifdef _DEBUG
Expand Down Expand Up @@ -507,6 +511,11 @@ bool sFodderParameters::ProcessINI() {
auto maxspawn = ini.get("maxspawn", 0);
if (maxspawn)
mSpawnEnemyMax = maxspawn;

if (mSpritesMax < MIN_SPRITES_MAX)
mSpritesMax = MIN_SPRITES_MAX;
if (mSpritesMax > MAX_SPRITES_MAX)
mSpritesMax = MAX_SPRITES_MAX;
}
}

Expand Down
3 changes: 3 additions & 0 deletions Source/Parameters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ class sFodderParameters {
size_t mSpritesMax;
size_t mSpawnEnemyMax;

static constexpr size_t MIN_SPRITES_MAX = 45;
static constexpr size_t MAX_SPRITES_MAX = 100000;

bool mShowHelp;
bool mCopyProtection;

Expand Down
Loading