diff options
| author | amitherman95 | 2019-10-19 16:50:46 +0300 |
|---|---|---|
| committer | Jozef Grajciar | 2019-10-19 21:14:06 +0200 |
| commit | 84856844e17f78e9f3a9f113df9d3ff23aad69e1 (patch) | |
| tree | 2f2a85bf82fab59fe431ea80ffc85a102a261eb9 /include/internal/catch_test_spec_parser.cpp | |
| parent | 01ef7076f50f5f2b481ddf082e1afca3c926983f (diff) | |
| download | catch3-84856844e17f78e9f3a9f113df9d3ff23aad69e1.tar.gz | |
Fixes #1766: Catch terminates when parsing invalid test name
Diffstat (limited to 'include/internal/catch_test_spec_parser.cpp')
| -rw-r--r-- | include/internal/catch_test_spec_parser.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/include/internal/catch_test_spec_parser.cpp b/include/internal/catch_test_spec_parser.cpp index 718185fa..b872b191 100644 --- a/include/internal/catch_test_spec_parser.cpp +++ b/include/internal/catch_test_spec_parser.cpp @@ -20,8 +20,13 @@ namespace Catch { m_substring.reserve(m_arg.size()); m_patternName.reserve(m_arg.size()); m_realPatternPos = 0; + for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) - visitChar( m_arg[m_pos] ); + //if visitChar fails + if( !visitChar( m_arg[m_pos] ) ){ + m_testSpec.m_invalidArgs.push_back(arg); + break; + } endMode(); return *this; } @@ -29,38 +34,32 @@ namespace Catch { addFilter(); return m_testSpec; } - void TestSpecParser::visitChar( char c ) { + bool TestSpecParser::visitChar( char c ) { if( (m_mode != EscapedName) && (c == '\\') ) { escape(); - m_substring += c; - m_patternName += c; - m_realPatternPos++; - return; + addCharToPattern(c); + return true; }else if((m_mode != EscapedName) && (c == ',') ) { - endMode(); - addFilter(); - return; + return separate(); } switch( m_mode ) { case None: if( processNoneChar( c ) ) - return; + return true; break; case Name: processNameChar( c ); break; case EscapedName: endMode(); - m_substring += c; - m_patternName += c; - m_realPatternPos++; - return; + addCharToPattern(c); + return true; default: case Tag: case QuotedName: if( processOtherChar( c ) ) - return; + return true; break; } @@ -69,6 +68,7 @@ namespace Catch { m_patternName += c; m_realPatternPos++; } + return true; } // Two of the processing methods return true to signal the caller to return // without adding the given character to the current pattern strings @@ -161,6 +161,20 @@ namespace Catch { m_mode = lastMode; } + bool TestSpecParser::separate() { + if( (m_mode==QuotedName) || (m_mode==Tag) ){ + //invalid argument, signal failure to previous scope. + m_mode = None; + m_pos = m_arg.size(); + m_substring.clear(); + m_patternName.clear(); + return false; + } + endMode(); + addFilter(); + return true; //success + } + TestSpec parseTestSpec( std::string const& arg ) { return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); } |