Add non-null assertion, don't print msg if empty string

2 files changed, 11 insertions, 1 deletions

diff --git a/src/utils/assert.cpp b/src/utils/assert.cpp
index 29af831d8..3747912d6 100644
--- a/src/utils/assert.cpp
+++ b/src/utils/assert.cpp
@@ -21,7 +21,7 @@ void assertion_failure(const char* expr_str,
 
    format << "Assertion " << expr_str << " failed ";
 
-   if(msg)
+   if(msg && msg[0] != 0)
       format << "(" << msg << ") ";
 
    if(func)
diff --git a/src/utils/assert.h b/src/utils/assert.h
index 67ca665e3..135c1d392 100644
--- a/src/utils/assert.h
+++ b/src/utils/assert.h
@@ -36,6 +36,16 @@ void assertion_failure(const char* expr_str,
                                   __LINE__);              \
    } while(0)
 
+#define BOTAN_ASSERT_NONNULL(ptr, msg)                    \
+   do {                                                   \
+      if(static_cast<bool>(ptr) == false)                 \
+         Botan::assertion_failure(#ptr " is not null",    \
+                                  msg,                    \
+                                  BOTAN_ASSERT_FUNCTION,  \
+                                  __FILE__,               \
+                                  __LINE__);              \
+   } while(0)
+
 /*
 * Unfortunately getting the function name from the preprocessor
 * isn't standard in C++98 (C++0x uses C99's __func__)