ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved StringUtils::insertValues to only print warnings, not crash, when something is wrong

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7146 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-12-23 01:30:38 +00:00
parent dbfe55071f
commit 51cc6b8d5c
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/utils/string_utils.cpp
View File

@ -282,14 +282,29 @@ namespace StringUtils
{
if(sv[i][1]=='s' || sv[i][1]=='d' || sv[i][1]=='i')
{
assert(all_vals.size() > insertValID);
new_string += all_vals[insertValID] + sv[i].substr(2);
if (insertValID >= all_vals.size())
{
fprintf(stderr, "[StringUtils::insertValues] ERROR: Invalid number of arguments in '%s'\n", s.c_str());
new_string += "??" + sv[i].substr(2);
}
else
{
new_string += all_vals[insertValID] + sv[i].substr(2);
}
insertValID++;
}
else if(sv[i][1]>='0' && sv[i][1]<= '9')
{
const unsigned int index = sv[i][1] - '0';
assert(all_vals.size() > index);
new_string += all_vals[index] + sv[i].substr(2);
if (index >= all_vals.size())
{
fprintf(stderr, "[StringUtils::insertValues] ERROR: Invalid argument index in '%s' for %i\n", s.c_str(), index);
new_string += "??" + sv[i].substr(2);
}
else
{
new_string += all_vals[index] + sv[i].substr(2);
}
}
else
{
@ -326,15 +341,34 @@ namespace StringUtils
{
if (sv[i][1]=='s' || sv[i][1]=='d' || sv[i][1]=='i')
{
new_string += all_vals[insertValID].c_str();
new_string += sv[i].subString(2, sv[i].size()-2);
if (insertValID >= all_vals.size())
{
fprintf(stderr, "[StringUtils::insertValues] ERROR: Invalid number of arguments in '%s'\n",
irr::core::stringc(s.c_str()).c_str());
new_string += "??";
new_string += sv[i].subString(2, sv[i].size()-2);
}
else
{
new_string += all_vals[insertValID].c_str();
new_string += sv[i].subString(2, sv[i].size()-2);
}
insertValID++;
}
else if(irr::core::isdigit(sv[i][1]))
{
const unsigned int index = irr::core::stringc(sv[i].c_str()).c_str()[1] - '0';
assert(all_vals.size() > index);
new_string += all_vals[index] + sv[i].subString(2, sv[i].size()-2);
if (index >= all_vals.size())
{
fprintf(stderr, "[StringUtils::insertValues] ERROR: Invalid argument ID in '%s' : %i\n",
irr::core::stringc(s.c_str()).c_str(), index);
new_string += "??";
new_string += sv[i].subString(2, sv[i].size()-2);
}
else
{
new_string += all_vals[index] + sv[i].subString(2, sv[i].size()-2);
}
}
else
{