rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🪲 WidgetLoader did not handle quoted layout strings

0.8
Bruno Van de Velde 2017-09-19 17:56:07 +02:00
parent c1be12fbf2
commit a0afbfb8c7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TGUI/Loading/Deserializer.cpp
View File

@ -204,7 +204,7 @@ namespace tgui
ObjectConverter deserializeString(const std::string& value)
{
// Only deserialize the string when it is surrounded with quotes
if (!value.empty() && ((value[0] == '"') && (value[value.length()-1] == '"')))
if ((value.size() >= 2) && ((value[0] == '"') && (value[value.length()-1] == '"')))
{
std::string result = value.substr(1, value.length()-2);

14
src/TGUI/Loading/WidgetLoader.cpp
View File

@ -104,12 +104,20 @@ namespace tgui
if (str.empty())
return {0, 0};
auto commaPos = str.find(',');
const auto commaPos = str.find(',');
if (commaPos == std::string::npos)
throw Exception{"Failed to parse layout '" + str + "'. Expected expressions separated with a comma."};
return {trim(str.substr(0, commaPos)),
trim(str.substr(commaPos + 1))};
// Remove quotes around the values
std::string x = trim(str.substr(0, commaPos));
if ((x.size() >= 2) && ((x[0] == '"') && (x[x.length()-1] == '"')))
x = x.substr(1, x.length()-2);
std::string y = trim(str.substr(commaPos + 1));
if ((y.size() >= 2) && ((y[0] == '"') && (y[y.length()-1] == '"')))
y = y.substr(1, y.length()-2);
return {x, y};
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////