minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Adding LuaError on attempt to assign vectors with values out of range

mutilcraft-mt53
Foghrye4 2016-10-23 20:45:25 +03:00 committed by Ner'zhul
parent 3db2f08ff9
commit 6eb6e75fff
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/common/c_converter.cpp
View File

@ -23,6 +23,7 @@ extern "C" {
} }
#include "util/numeric.h" #include "util/numeric.h"
#include "util/serialize.h"
#include "util/string.h" #include "util/string.h"
#include "common/c_converter.h" #include "common/c_converter.h"
#include "constants.h" #include "constants.h"
@ -37,6 +38,14 @@ extern "C" {
} \ } \
} while(0) } while(0)
#define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER) #define CHECK_POS_COORD(name) CHECK_TYPE(-1, "position coordinate '" name "'", LUA_TNUMBER)
#define CHECK_FLOAT_RANGE(value, name) \
if (value < F1000_MIN || value > F1000_MAX) { \
std::ostringstream error_text; \
error_text << "Invalid float vector dimension range '" name "' " << \
"(expected " << F1000_MIN << " < " name " < " << F1000_MAX << \
" got " << value << ")." << std::endl; \
throw LuaError(error_text.str()); \
}
#define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE) #define CHECK_POS_TAB(index) CHECK_TYPE(index, "position", LUA_TTABLE)
@ -170,14 +179,17 @@ v3f check_v3f(lua_State *L, int index)
lua_getfield(L, index, "x"); lua_getfield(L, index, "x");
CHECK_POS_COORD("x"); CHECK_POS_COORD("x");
pos.X = lua_tonumber(L, -1); pos.X = lua_tonumber(L, -1);
CHECK_FLOAT_RANGE(pos.X, "x")
lua_pop(L, 1); lua_pop(L, 1);
lua_getfield(L, index, "y"); lua_getfield(L, index, "y");
CHECK_POS_COORD("y"); CHECK_POS_COORD("y");
pos.Y = lua_tonumber(L, -1); pos.Y = lua_tonumber(L, -1);
CHECK_FLOAT_RANGE(pos.Y, "y")
lua_pop(L, 1); lua_pop(L, 1);
lua_getfield(L, index, "z"); lua_getfield(L, index, "z");
CHECK_POS_COORD("z"); CHECK_POS_COORD("z");
pos.Z = lua_tonumber(L, -1); pos.Z = lua_tonumber(L, -1);
CHECK_FLOAT_RANGE(pos.Z, "z")
lua_pop(L, 1); lua_pop(L, 1);
return pos; return pos;
} }

4
src/script/lua_api/l_object.cpp
View File

@ -606,10 +606,10 @@ int ObjectRef::l_set_bone_position(lua_State *L)
bone = lua_tostring(L, 2); bone = lua_tostring(L, 2);
v3f position = v3f(0, 0, 0); v3f position = v3f(0, 0, 0);
if (!lua_isnil(L, 3)) if (!lua_isnil(L, 3))
position = read_v3f(L, 3); position = check_v3f(L, 3);
v3f rotation = v3f(0, 0, 0); v3f rotation = v3f(0, 0, 0);
if (!lua_isnil(L, 4)) if (!lua_isnil(L, 4))
rotation = read_v3f(L, 4); rotation = check_v3f(L, 4);
co->setBonePosition(bone, position, rotation); co->setBonePosition(bone, position, rotation);
return 0; return 0;
} }