fixing UB

bogdasar1985 · horenmar · commit 3ceaad7d6603 · 2020-07-22T17:17:33.000+02:00
diff --git a/src/catch2/internal/catch_clara_upstream.hpp b/src/catch2/internal/catch_clara_upstream.hpp
@@ -667,7 +667,7 @@ namespace detail {
     }
     inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
         std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( std::tolower(c) ); } );
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
         if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
             target = true;
         else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
diff --git a/src/catch2/internal/catch_string_manip.cpp b/src/catch2/internal/catch_string_manip.cpp
@@ -18,7 +18,7 @@ namespace Catch {
 
     namespace {
         char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( c ) );
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
         }
     }
 
diff --git a/third_party/clara.hpp b/third_party/clara.hpp
@@ -667,7 +667,7 @@ namespace detail {
     }
     inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
         std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( ::tolower(c) ); } );
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( ::tolower( c ) ); } );
         if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
             target = true;
         else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ namespace detail {`
`667`	`667`	`}`
`668`	`668`	`inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {`
`669`	`669`	`std::string srcLC = source;`
`670`		`- std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( std::tolower(c) ); } );`
	`670`	`+ std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );`
`671`	`671`	`if (srcLC == "y" \|\| srcLC == "1" \|\| srcLC == "true" \|\| srcLC == "yes" \|\| srcLC == "on")`
`672`	`672`	`target = true;`
`673`	`673`	`else if (srcLC == "n" \|\| srcLC == "0" \|\| srcLC == "false" \|\| srcLC == "no" \|\| srcLC == "off")`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Catch {`
`18`	`18`
`19`	`19`	`namespace {`
`20`	`20`	`char toLowerCh(char c) {`
`21`		`- return static_cast<char>( std::tolower( c ) );`
	`21`	`+ return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`