celeron55
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enforce modname naming convention

master
Perttu Ahola 2011-12-04 18:26:05 +02:00
parent 008de2fb8f
commit abd106bacb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scriptapi.cpp
View File

@ -164,7 +164,7 @@ void check_modname_prefix(lua_State *L, std::string &name)
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_")) "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"))
throw LuaError(L, std::string("Name \"")+name throw LuaError(L, std::string("Name \"")+name
+"\" does not follow naming conventions: " +"\" does not follow naming conventions: "
+"\"contains unallowed characters)"); +"\"contains unallowed characters");
} }
static v3f readFloatPos(lua_State *L, int index) static v3f readFloatPos(lua_State *L, int index)
@ -2672,6 +2672,14 @@ bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
{ {
ModNameStorer modnamestorer(L, modname); ModNameStorer modnamestorer(L, modname);
if(!string_allowed(modname, "abcdefghijklmnopqrstuvwxyz"
"0123456789_")){
errorstream<<"Error loading mod \""<<modname
<<"\": modname does not follow naming conventions: "
<<"Only chararacters [a-z0-9_] are allowed."<<std::endl;
return false;
}
bool success = false; bool success = false;
try{ try{