phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 01:23:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(editor): cap stamp vertex count and skip NaN samples on load

Browse source 
A malformed stamp JSON could carry millions of entries (would OOM)
or NaN dx/dy/height (would propagate through brush blends and leave
permanent holes in the heightmap).
This commit is contained in:
Kelsi 2026-05-06 06:45:41 -07:00
parent 0a5583310c
commit cc1e1cb7fa
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/editor/terrain_editor.cpp
View file

@ -1516,12 +1516,23 @@ bool TerrainEditor::loadStamp(const std::string& path) {
if (!j.contains("vertices") || !j["vertices"].is_array()) return false;
stampData_.clear();
// Cap stamp size — stamps blast directly into chunk heights, so a
// huge or NaN-laden stamp would corrupt the terrain irreversibly.
constexpr size_t kMaxStampVerts = 1'000'000;
if (j["vertices"].size() > kMaxStampVerts) {
LOG_ERROR("Stamp vertexCount too large: ", j["vertices"].size());
return false;
}
for (const auto& v : j["vertices"]) {
if (!v.is_array() || v.size() < 3) continue;
StampVertex sv;
sv.dx = v[0].get<float>();
sv.dy = v[1].get<float>();
sv.height = v[2].get<float>();
// Skip non-finite samples — they'd propagate through brush blends
// and produce permanent NaN holes in the heightmap.
if (!std::isfinite(sv.dx) || !std::isfinite(sv.dy) ||
!std::isfinite(sv.height)) continue;
stampData_.push_back(sv);
}
stampCenter_ = glm::vec3(0);