loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace some invalid_argument exceptions

Browse Source 
Throw ConditionSyntaxError instead when evaluating conditions.
This commit is contained in:
Oliver Hamlet
2016-12-14 22:08:40 +00:00
parent bf6709add1
commit a3d65f020a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata/condition_evaluator.cpp
+4 -3
View File
@@ -27,6 +27,7 @@
#include <boost/log/trivial.hpp>
#include "backend/helpers/helpers.h"
#include "loot/exception/condition_syntax_error.h"
using boost::format;
using boost::locale::translate;
@@ -170,7 +171,7 @@ void ConditionEvaluator::validatePath(const boost::filesystem::path& path) {
if (component == ".." && temp.filename() == "..") {
BOOST_LOG_TRIVIAL(error) << "Invalid file path: " << path;
throw std::invalid_argument((format(translate("Invalid file path: %1%")) % path.string()).str());
throw ConditionSyntaxError((format(translate("Invalid file path: %1%")) % path.string()).str());
}
temp /= component;
@@ -180,7 +181,7 @@ void ConditionEvaluator::validateRegex(const std::string& regexString) {
try {
std::regex(regexString, std::regex::ECMAScript | std::regex::icase);
} catch (std::regex_error& e) {
throw std::invalid_argument((format(translate("Invalid regex string \"%1%\": %2%")) % regexString % e.what()).str());
throw ConditionSyntaxError((format(translate("Invalid regex string \"%1%\": %2%")) % regexString % e.what()).str());
}
}
@@ -220,7 +221,7 @@ std::pair<boost::filesystem::path, std::regex> ConditionEvaluator::splitRegex(co
reg = std::regex(filename, std::regex::ECMAScript | std::regex::icase);
} catch (std::regex_error& e) {
BOOST_LOG_TRIVIAL(error) << "Invalid regex string:" << filename;
throw std::invalid_argument((boost::format(boost::locale::translate("Invalid regex string \"%1%\": %2%")) % filename % e.what()).str());
throw ConditionSyntaxError((boost::format(boost::locale::translate("Invalid regex string \"%1%\": %2%")) % filename % e.what()).str());
}
return std::pair<boost::filesystem::path, std::regex>(parent, reg);
src/tests/backend/metadata/condition_grammar_test.h
+2 -2
View File
@@ -155,7 +155,7 @@ TEST_P(ConditionGrammarTest, evaluatingAFileConditionForAnUnsafePathShouldThrow)
std::cend(condition),
grammar,
skipper_,
result_), std::invalid_argument);
result_), ConditionSyntaxError);
}
TEST_P(ConditionGrammarTest, aFileConditionWithAnInvalidRegexShouldThrow) {
@@ -166,7 +166,7 @@ TEST_P(ConditionGrammarTest, aFileConditionWithAnInvalidRegexShouldThrow) {
std::cend(condition),
grammar,
skipper_,
result_), std::invalid_argument);
result_), ConditionSyntaxError);
}
TEST_P(ConditionGrammarTest, aFileConditionWithARegexMatchingAPluginThatExistsShouldEvaluateToTrue) {