mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 02:43:57 +02:00
Code Issues Projects Releases Wiki Activity

- check for empty strings before using substr to avoid crashes with more strict C++ engine

Browse Source
This commit is contained in:
SoftCoder
2017-09-30 21:46:56 -07:00
parent a7a92056eb
commit edfb1508f5
6 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/shared_lib/sources/util/util.cpp
View File

@@ -640,7 +640,7 @@ string lastDir(const string &s) {
string retry = s.substr(0, pos);
return lastDir(retry);
}
string result = s.substr(pos+1, s.length());
string result = (s.empty() == false ? s.substr(pos+1, s.length()) : "");
replaceAll(result,"/","");
replaceAll(result,"\\","");
@@ -715,16 +715,18 @@ string replaceBy(const string &s, char c1, char c2){
vector<string> split(string s,string d) {
vector<string> results;
size_t lastOffset = 0;
while(true)
{
size_t offset = s.find_first_of(d, lastOffset);
results.push_back(s.substr(lastOffset, offset - lastOffset));
if (offset == string::npos)
break;
else
lastOffset = offset + d.size(); //skip the delimiter
if(s.empty() == false) {
size_t lastOffset = 0;
while(true) {
size_t offset = s.find_first_of(d, lastOffset);
results.push_back(s.substr(lastOffset, offset - lastOffset));
if (offset == string::npos)
break;
else
lastOffset = offset + d.size(); //skip the delimiter
}
}
return results;
}
@@ -822,7 +824,11 @@ int compareMajorMinorVersion(string versionA,string versionB) {
}
int getMajor(string version) {
vector<string> parts = split(version.substr(1),".");
vector<string> parts;
if(version.empty() == false) {
parts = split(version.substr(1),".");
}
if(parts.size() > 1 && parts[0] != "" && IsNumeric(parts[0].c_str(),false)) {
return strToInt(parts[0]);
@@ -833,7 +839,11 @@ int getMajor(string version) {
}
int getMinor(string version) {
vector<string> parts = split(version.substr(1),".");
vector<string> parts;
if(version.empty() == false) {
parts = split(version.substr(1),".");
}
if(parts.size() > 1 && parts[1] != "") {
string resultStr="";
for (int i = 0; i < (int)parts[1].length(); ++i) {