moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-22 23:58:48 -05:00
Code Issues Releases Wiki Activity

LuaPerlinNoiseMap: Prevent invalid memory access when attempting to generate 3d noise with a buffer created for 2d

Browse Source
This commit is contained in:
kwolekr 2014-12-12 02:46:52 -05:00
parent 00fc0babe0
commit 4e5d17f666
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/script/lua_api/l_noise.cpp
View File

@ -60,17 +60,6 @@ LuaPerlinNoise::LuaPerlinNoise(NoiseParams *params) :
} }
/*
LuaPerlinNoise::LuaPerlinNoise(int a_seed, int a_octaves,
float a_persistence, float a_scale)
{
np.seed = a_seed;
np.octaves = a_octaves;
np.persist = a_persistence;
np.spread = v3f(a_scale, a_scale, a_scale);
}
*/
LuaPerlinNoise::~LuaPerlinNoise() LuaPerlinNoise::~LuaPerlinNoise()
{ {
} }
@ -215,6 +204,9 @@ int LuaPerlinNoiseMap::l_get3dMap(lua_State *L)
LuaPerlinNoiseMap *o = checkobject(L, 1); LuaPerlinNoiseMap *o = checkobject(L, 1);
v3f p = read_v3f(L, 2); v3f p = read_v3f(L, 2);
if (!o->m_is3d)
return 0;
Noise *n = o->noise; Noise *n = o->noise;
n->perlinMap3D(p.X, p.Y, p.Z); n->perlinMap3D(p.X, p.Y, p.Z);
@ -242,6 +234,9 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
LuaPerlinNoiseMap *o = checkobject(L, 1); LuaPerlinNoiseMap *o = checkobject(L, 1);
v3f p = read_v3f(L, 2); v3f p = read_v3f(L, 2);
if (!o->m_is3d)
return 0;
Noise *n = o->noise; Noise *n = o->noise;
n->perlinMap3D(p.X, p.Y, p.Z); n->perlinMap3D(p.X, p.Y, p.Z);
@ -256,11 +251,12 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
} }
LuaPerlinNoiseMap::LuaPerlinNoiseMap(NoiseParams *np, int seed, v3s16 size) LuaPerlinNoiseMap::LuaPerlinNoiseMap(NoiseParams *params, int seed, v3s16 size)
{ {
memcpy(&m_noise_params, np, sizeof(m_noise_params)); m_is3d = size.Z <= 1;
np = *params;
try { try {
noise = new Noise(&m_noise_params, seed, size.X, size.Y, size.Z); noise = new Noise(&np, seed, size.X, size.Y, size.Z);
} catch (InvalidNoiseParamsException &e) { } catch (InvalidNoiseParamsException &e) {
throw LuaError(e.what()); throw LuaError(e.what());
} }

4
src/script/lua_api/l_noise.h
View File

@ -30,7 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class LuaPerlinNoise : public ModApiBase { class LuaPerlinNoise : public ModApiBase {
private: private:
NoiseParams np; NoiseParams np;
static const char className[]; static const char className[];
static const luaL_reg methods[]; static const luaL_reg methods[];
@ -59,8 +58,9 @@ public:
LuaPerlinNoiseMap LuaPerlinNoiseMap
*/ */
class LuaPerlinNoiseMap : public ModApiBase { class LuaPerlinNoiseMap : public ModApiBase {
NoiseParams m_noise_params; NoiseParams np;
Noise *noise; Noise *noise;
bool m_is3d;
static const char className[]; static const char className[];
static const luaL_reg methods[]; static const luaL_reg methods[];