tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in DiagnosticInformation().

Browse Source 
Refs #5870
This commit is contained in:
Gunnar Beutner 2014-03-29 23:02:55 +01:00
parent 64aa5d1b09
commit eb30f69454
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base/exception.h
View File

@ -61,19 +61,22 @@ String DiagnosticInformation(const T& ex, StackTrace *stack = NULL, ContextTrace
if (boost::get_error_info<StackTraceErrorInfo>(ex) == NULL) { if (boost::get_error_info<StackTraceErrorInfo>(ex) == NULL) {
result << std::endl; result << std::endl;
if (!stack)
stack = GetLastExceptionStack();
if (stack) if (stack)
result << *stack; result << *stack;
else
result << *GetLastExceptionStack();
} }
if (boost::get_error_info<ContextTraceErrorInfo>(ex) == NULL) { if (boost::get_error_info<ContextTraceErrorInfo>(ex) == NULL) {
result << std::endl; result << std::endl;
if (!context)
context = GetLastExceptionContext();
if (context) if (context)
result << *context; result << *context;
else
result << *GetLastExceptionContext();
} }
} }