Added null-ptr check in Colour::use()

catchorg · Jun 15, 2019 · bbbd5c4 · bbbd5c4
1 parent f41051f
commit bbbd5c4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/include/internal/catch_console_colour.cpp b/include/internal/catch_console_colour.cpp
@@ -222,7 +222,13 @@ namespace Catch {
 
     void Colour::use( Code _colourCode ) {
         static IColourImpl* impl = platformColourInstance();
-        impl->use( _colourCode );
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != NULL) {
+            impl->use( _colourCode );
+        }
     }
 
     std::ostream& operator << ( std::ostream& os, Colour const& ) {