From e17f140be00e9bf4674aa7e8b2338cefc1a6375b Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 27 Apr 2014 21:31:46 -0400 Subject: Add a limit to node meta data resolving recursion --- src/nodemetadata.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/nodemetadata.cpp') diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index 911d86d22..4cdd61767 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -191,3 +191,34 @@ void NodeMetadataList::clear() } m_data.clear(); } + +std::string NodeMetadata::getString(const std::string &name, unsigned short recursion) const +{ + std::map::const_iterator it; + it = m_stringvars.find(name); + if (it == m_stringvars.end()) { + return ""; + } + return resolveString(it->second, recursion); +} + +void NodeMetadata::setString(const std::string &name, const std::string &var) +{ + if (var.empty()) { + m_stringvars.erase(name); + } else { + m_stringvars[name] = var; + } +} + +std::string NodeMetadata::resolveString(const std::string &str, unsigned short recursion) const +{ + if (recursion > 1) { + return str; + } + if (str.substr(0, 2) == "${" && str[str.length() - 1] == '}') { + return getString(str.substr(2, str.length() - 3), recursion + 1); + } + return str; +} + -- cgit v1.2.3