oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Add missing chunk size safety checks (#16502)

Browse source
This commit is contained in:
sfan5 2025-09-22 18:46:22 +02:00 • committed by GitHub
parent d5ddee6cbf
commit 4c29bf6923
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mapgen/mapgen_v6.cpp
View file

@ -43,6 +43,18 @@ const FlagDesc flagdesc_mapgen_v6[] = {
MapgenV6::MapgenV6(MapgenV6Params *params, EmergeParams *emerge) MapgenV6::MapgenV6(MapgenV6Params *params, EmergeParams *emerge)
: Mapgen(MAPGEN_V6, params, emerge) : Mapgen(MAPGEN_V6, params, emerge)
{ {
if (csize.X != csize.Y || csize.Y != csize.Z) {
// In practice:
// (5,2,1) segfaults in mudflow
// (5,2,5) generates very broken terrain
throw BaseException("MapgenV6: chunk size must be cubic");
}
if (csize.Y % 2 == 0) {
// weird ledges appear in some places
warningstream << "MapgenV6: chunk heights divisible by two are known "
"to be buggy." << std::endl;
}
ystride = csize.X; ystride = csize.X;
heightmap = new s16[csize.X * csize.Z]; heightmap = new s16[csize.X * csize.Z];

4
src/mapgen/mg_decoration.cpp
View file

@ -132,6 +132,10 @@ void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
PcgRandom ps(blockseed + 53); PcgRandom ps(blockseed + 53);
int carea_size = nmax.X - nmin.X + 1; int carea_size = nmax.X - nmin.X + 1;
if (nmax.Z - nmin.Z + 1 != carea_size) {
// TODO: this is a stupid restriction, which we should lift
throw BaseException("Decoration::placeDeco requires a square area (XZ)");
}
// Divide area into parts // Divide area into parts
// If chunksize is changed it may no longer be divisable by sidelen // If chunksize is changed it may no longer be divisable by sidelen