build 30

- with Clara fix for null deref crash

2 files changed, 4 insertions, 3 deletions

diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index b19a036e..85181d64 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 29, "master" );
+    Version libraryVersion( 1, 0, 30, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/include/internal/clara.h b/include/internal/clara.h
index 476f2343..a8b50575 100644
--- a/include/internal/clara.h
+++ b/include/internal/clara.h
@@ -176,6 +176,7 @@ namespace Tbc {
 
 #undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
 
+
 #include <map>
 #include <algorithm>
 #include <stdexcept>
@@ -261,9 +262,9 @@ namespace Clara {
         public:
             BoundArgFunction() : functionObj( NULL ) {}
             BoundArgFunction( IArgFunction<ConfigT>* _functionObj ) : functionObj( _functionObj ) {}
-            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj->clone() ) {}
+            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : NULL ) {}
             BoundArgFunction& operator = ( BoundArgFunction const& other ) {
-                IArgFunction<ConfigT>* newFunctionObj = other.functionObj->clone();
+                IArgFunction<ConfigT>* newFunctionObj = other.functionObj ? other.functionObj->clone() : NULL;
                 delete functionObj;
                 functionObj = newFunctionObj;
                 return *this;