Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-12-30 23:50:40 +0100
committerMartin Hořeňovský2022-01-01 14:16:11 +0100
commitfae0be25b3e1bdd07a18465749488650616d78f9 (patch)
treef0fd7d41d82bac9ee38f095cab0193f35ec13ace /src/catch2/internal
parent899554bff2ba64afa7a20e1796b85d396cbbfd8d (diff)
downloadcatch3-fae0be25b3e1bdd07a18465749488650616d78f9.tar.gz
Improve error handling in parsing reporter specs
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_commandline.cpp30
1 files changed, 23 insertions, 7 deletions
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp
index 4ce085ca..ca0e1c20 100644
--- a/src/catch2/internal/catch_commandline.cpp
+++ b/src/catch2/internal/catch_commandline.cpp
@@ -135,6 +135,10 @@ namespace Catch {
return ParserResult::ok( ParseResultType::Matched );
};
auto const setReporter = [&]( std::string const& reporterSpec ) {
+ if ( reporterSpec.empty() ) {
+ return ParserResult::runtimeError( "Received empty reporter spec." );
+ }
+
IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
// clear the default reporter
@@ -143,21 +147,33 @@ namespace Catch {
config._nonDefaultReporterSpecifications = true;
}
+
// Exactly one of the reporters may be specified without an output
// file, in which case it defaults to the output specified by "-o"
// (or standard output).
static constexpr auto separator = "::";
static constexpr size_t separatorSize = 2;
- auto separatorPos = reporterSpec.find( separator );
- const bool containsFileName = separatorPos != reporterSpec.npos;
+ auto fileNameSeparatorPos = reporterSpec.find( separator );
+ const bool containsFileName = fileNameSeparatorPos != reporterSpec.npos;
+ if ( containsFileName ) {
+ auto nextSeparatorPos = reporterSpec.find(
+ separator, fileNameSeparatorPos + separatorSize );
+ if ( nextSeparatorPos != reporterSpec.npos ) {
+ return ParserResult::runtimeError(
+ "Too many separators in reporter spec '" + reporterSpec + '\'' );
+ }
+ }
+
std::string reporterName;
Optional<std::string> outputFileName;
- if (!containsFileName) {
- reporterName = reporterSpec;
- } else {
- reporterName = reporterSpec.substr( 0, separatorPos );
+ reporterName = reporterSpec.substr( 0, fileNameSeparatorPos );
+ if ( reporterName.empty() ) {
+ return ParserResult::runtimeError( "Reporter name cannot be empty." );
+ }
+
+ if ( containsFileName ) {
outputFileName = reporterSpec.substr(
- separatorPos + separatorSize, reporterSpec.size() );
+ fileNameSeparatorPos + separatorSize, reporterSpec.size() );
}
auto result = factories.find( reporterName );