BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Settings: Sanitize value for multiline terminator tokens

Browse Source
This commit is contained in:
kwolekr 2014-12-11 23:25:42 -05:00
parent f114fc74d6
commit b0c4fd6d3f
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/settings.cpp
View File

@ -63,6 +63,32 @@ Settings & Settings::operator = (const Settings &other)
} }
std::string Settings::sanitizeName(const std::string &name)
{
std::string n(name);
for (const char *s = "\t\n\v\f\r\b =\"{}#"; *s; s++)
n.erase(std::remove(n.begin(), n.end(), *s), n.end());
return n;
}
std::string Settings::sanitizeValue(const std::string &value)
{
std::string v(value);
size_t p = 0;
if (v.substr(0, 3) == "\"\"\"")
v.erase(0, 3);
while ((p = v.find("\n\"\"\"")) != std::string::npos)
v.erase(p, 4);
return v;
}
std::string Settings::getMultiline(std::istream &is, size_t *num_lines) std::string Settings::getMultiline(std::istream &is, size_t *num_lines)
{ {
size_t lines = 1; size_t lines = 1;
@ -683,11 +709,7 @@ void Settings::setEntry(const std::string &name, const void *data,
{ {
Settings *old_group = NULL; Settings *old_group = NULL;
// Strip any potentially dangerous characters from the name (note the value std::string n = sanitizeName(name);
// has no such restrictions)
std::string n(name);
for (const char *s = "\t\n\v\f\r\b =\""; *s; s++)
n.erase(std::remove(n.begin(), n.end(), *s), n.end());
{ {
JMutexAutoLock lock(m_mutex); JMutexAutoLock lock(m_mutex);
@ -695,7 +717,7 @@ void Settings::setEntry(const std::string &name, const void *data,
SettingsEntry &entry = set_default ? m_defaults[n] : m_settings[n]; SettingsEntry &entry = set_default ? m_defaults[n] : m_settings[n];
old_group = entry.group; old_group = entry.group;
entry.value = set_group ? "" : *(const std::string *)data; entry.value = set_group ? "" : sanitizeValue(*(const std::string *)data);
entry.group = set_group ? *(Settings **)data : NULL; entry.group = set_group ? *(Settings **)data : NULL;
entry.is_group = set_group; entry.is_group = set_group;
} }

2
src/settings.h
View File

@ -112,6 +112,8 @@ public:
bool updateConfigObject(std::istream &is, std::ostream &os, bool updateConfigObject(std::istream &is, std::ostream &os,
const std::string &end, u32 tab_depth=0); const std::string &end, u32 tab_depth=0);
static std::string sanitizeName(const std::string &name);
static std::string sanitizeValue(const std::string &value);
static std::string getMultiline(std::istream &is, size_t *num_lines=NULL); static std::string getMultiline(std::istream &is, size_t *num_lines=NULL);
static void printEntry(std::ostream &os, const std::string &name, static void printEntry(std::ostream &os, const std::string &name,
const SettingsEntry &entry, u32 tab_depth=0); const SettingsEntry &entry, u32 tab_depth=0);