liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Segfault when v2 ICC profiles do not contain parsable 'gamma/slope' info, fixes #5144

Browse Source
This commit is contained in:
heckflosse
2019-01-19 19:15:32 +01:00
parent 4d241d7e10
commit 36ca01616b
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtengine/iccstore.cc
View File

@@ -255,14 +255,21 @@ bool get_RT_gamma_slope(cmsHPROFILE profile, double &gammatag, double &slopetag)
modelDesc = utf32_to_utf8(buffer, count); modelDesc = utf32_to_utf8(buffer, count);
#endif #endif
if (!modelDesc.empty()) { if (!modelDesc.empty()) {
std::size_t pos = modelDesc.find("g"); try {
std::size_t posmid = modelDesc.find("s"); std::size_t pos = modelDesc.find("g");
std::size_t posend = modelDesc.find("!"); std::size_t posmid = modelDesc.find("s");
std::string strgamma = modelDesc.substr(pos + 1, (posmid - pos)); std::size_t posend = modelDesc.find("!");
gammatag = std::stod(strgamma.c_str()); if (pos == std::string::npos || posmid == std::string::npos || posend == std::string::npos) {
std::string strslope = modelDesc.substr(posmid + 1, (posend - posmid)); return false;
slopetag = std::stod(strslope.c_str()); }
return true; std::string strgamma = modelDesc.substr(pos + 1, (posmid - pos));
gammatag = std::stod(strgamma.c_str());
std::string strslope = modelDesc.substr(posmid + 1, (posend - posmid));
slopetag = std::stod(strslope.c_str());
return true;
} catch (std::invalid_argument &) {
return false;
}
} }
} }
} }