minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-11-16 07:20:28 +01:00
Code Issues Releases Wiki Activity

LuaSettings: Sanitize setting name strings

Browse Source
This commit is contained in:
kwolekr 2014-11-30 19:01:37 -05:00
parent 16781da4f9
commit 360660947b
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/lua_api/l_settings.cpp
View File

@ -73,7 +73,7 @@ int LuaSettings::l_set(lua_State* L)
std::string key = std::string(luaL_checkstring(L, 2));
const char* value = luaL_checkstring(L, 3);
o->m_settings->set(key, value);
o->m_settings->set(Settings::sanitizeString(key), value);
return 1;
}

10
src/settings.cpp
View File

@ -63,6 +63,16 @@ Settings & Settings::operator = (const Settings &other)
}
std::string Settings::sanitizeString(const std::string &value)
{
std::string str = value;
for (const char *s = "\t\n\v\f\r\b =\""; *s; s++)
str.erase(std::remove(str.begin(), str.end(), *s), str.end());
return str;
}
std::string Settings::getMultiline(std::istream &is)
{
std::string value;

1
src/settings.h
View File

@ -117,6 +117,7 @@ public:
const std::string &end, u32 tab_depth=0);
static std::string getMultiline(std::istream &is);
static std::string sanitizeString(const std::string &value);
static void printValue(std::ostream &os, const std::string &name,
const SettingsEntry &entry, bool is_value_multiline, u32 tab_depth=0);