Fix crash in DiagnosticInformation().

Refs #5870

diff --git a/lib/base/exception.h b/lib/base/exception.h
index 872f69fd4e268f1e100174fb38bf17e27626ac41..79783c5e7882d3bcd9fa53a37f7b50284e5d2d0f 100644 (file)
--- a/lib/base/exception.h
+++ b/lib/base/exception.h
@@ -61,19 +61,22 @@ String DiagnosticInformation(const T& ex, StackTrace *stack = NULL, ContextTrace
                if (boost::get_error_info<StackTraceErrorInfo>(ex) == NULL) {
                        result << std::endl;
 
+                       if (!stack)
+                               stack = GetLastExceptionStack();
+                       
                        if (stack)
                                result << *stack;
-                       else
-                               result << *GetLastExceptionStack();
+                               
                }
 
                if (boost::get_error_info<ContextTraceErrorInfo>(ex) == NULL) {
                        result << std::endl;
 
+                       if (!context)
+                               context = GetLastExceptionContext();
+
                        if (context)
                                result << *context;
-                       else
-                               result << *GetLastExceptionContext();
                }
        }