mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-28 16:39:01 +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

13
source/shared_lib/sources/graphics/model.cpp
View File

@@ -1167,23 +1167,24 @@ void Model::load(const string &path, bool deletePixMapAfterLoad,
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
return;
}
string extension= path.substr(path.find_last_of('.') + 1);
if(extension=="g3d" || extension=="G3D") {
size_t pos = path.find_last_of('.');
string extension = toLower(path.empty() == false ? path.substr(pos + 1) : "");
if(extension == "g3d") {
loadG3d(path,deletePixMapAfterLoad,loadedFileList, this->sourceLoader);
}
else {
throw megaglest_runtime_error("Unknown model format: " + extension);
throw megaglest_runtime_error("#1 Unknown model format [" + extension + "] file [" + path + "]");
}
}
void Model::save(const string &path, string convertTextureToFormat,
bool keepsmallest) {
string extension= path.substr(path.find_last_of('.')+1);
if(extension=="g3d" ||extension=="G3D") {
string extension = (path.empty() == false ? path.substr(path.find_last_of('.')+1) : "");
if(toLower(extension) == "g3d") {
saveG3d(path,convertTextureToFormat,keepsmallest);
}
else {
throw megaglest_runtime_error("Unknown model format: " + extension);
throw megaglest_runtime_error("#2 Unknown model format [" + extension + "] file [" + path + "]");
}
}