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

Fix std::out_of_range exception with empty HaldCLUT basename

Browse Source 
User jgschaefer [reported an error on pixls.us](https://discuss.pixls.us/t/rt-build-from-git-crash-on-launch-debian-testing-64-bit/1425)
which could be traced down to an empty basename for a HaldCLUT. The
original implementation did not throw an exception due to the use of
`std::string::substr()` instead of `std::string::erase()`, but silently
assigned the first working profile to `profile_name`.
This commit is contained in:
Flössie
2016-05-17 20:51:14 +02:00
parent 89a7ebac16
commit 68a77f26f6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/clutstore.cc
View File

@@ -283,14 +283,19 @@ void rtengine::HaldCLUT::splitClutFilename(
profile_name = "sRGB"; profile_name = "sRGB";
if (!name.empty()) {
for (const auto& working_profile : rtengine::getWorkingProfiles()) { for (const auto& working_profile : rtengine::getWorkingProfiles()) {
if (std::search(name.rbegin(), name.rend(), working_profile.rbegin(), working_profile.rend()) == name.rbegin()) { if (
!working_profile.empty() // This isn't strictly needed, but an empty wp name should be skipped anyway
&& std::search(name.rbegin(), name.rend(), working_profile.rbegin(), working_profile.rend()) == name.rbegin()
) {
profile_name = working_profile; profile_name = working_profile;
name.erase(name.size() - working_profile.size()); name.erase(name.size() - working_profile.size());
break; break;
} }
} }
} }
}
rtengine::CLUTStore& rtengine::CLUTStore::getInstance() rtengine::CLUTStore& rtengine::CLUTStore::getInstance()
{ {