fix(heightmapedit): Fix undefined behaviors in WorldHeightMapEdit::remapTextures, WorldHeightMapEdit::findBoundaryNear

[CryoTheRenegade]

Initialize anyChanges to false so remapTextures() returns a defined value when no texture classes change.
Return from findBoundaryNear() after handling a null point to prevent a null dereference.
Found with clang-tidy

[qodo-free-for-open-source-projects]

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Tip of the day

💡 Did you know, you can hide the parts of a finding you never read, like the evidence or the agent prompt

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

[qodo-free-for-open-source-projects]

PR Summary by Qodo

Fix undefined height map editor behavior

🐞 Bug fix 🕐 Less than 10 minutes

AI Description

• Initialize texture remapping state to return false when no classes change.
• Stop boundary searches after null input handling to prevent dereferencing null pointers.
• Apply both safety fixes across the Generals and GeneralsMD editors.

Diagram

graph TD
  A["Height map edit"] --> B{"Requested action"}
  B -->|"Remap textures"| C["False baseline"] --> D["Defined result"]
  B -->|"Find boundary"| E{"Point available"}
  E -->|"No"| F["Set index -1"] --> G["Return safely"]
  E -->|"Yes"| H["Search boundaries"]

Loading

High-Level Assessment

The PR uses the appropriate minimal defensive fixes: initialize the accumulator at declaration and return immediately after handling invalid input. Broader API changes, such as replacing pointer outputs with value-returning types, would create unnecessary scope for these mirrored legacy implementations.

Files changed (2) +4 / -2

Bug fix (2) +4 / -2

WHeightMapEdit.cppMake Generals height map operations deterministic and null-safe +2/-1

Make Generals height map operations deterministic and null-safe

• Initializes the texture-remapping change flag to false so the function always returns a defined value. Returns immediately after reporting a null boundary point, preventing coordinate access through a null pointer.

Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

WHeightMapEdit.cppMirror height map safety fixes in GeneralsMD +2/-1

Mirror height map safety fixes in GeneralsMD

• Applies the same deterministic texture-remapping state and null-point early return to the GeneralsMD WorldBuilder implementation, keeping both variants behaviorally aligned.

GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

[Skyaero42]

How would this undefined behaviour show in the game?

[Caball009]

Function: WorldHeightMapEdit::remapTextures
User action: World Builder -> Texture Sizing -> Remap Textures -> Cancel

Looks like it just does unnecessary work.

---

Function: WorldHeightMapEdit::findBoundaryNear
User action: World Builder -> Border Tool -> Click on map border

Cannot be nullptr because it's initialized in BorderTool::mouseDown as Coord3D groundPt and only has one call site currently.

Ideally, all parameters for that function are passed by reference, but that's a larger change as there are many functions in that class that pass by pointer.