mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-24 07:18:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Always print cr2 and ip as long if siginfo and ucontext are available

Browse Source
This commit is contained in:
Kfir Itzhak committed 2013-10-07 11:07:41 +03:00
1 parent 1d7f664627
commit 2cb65c6430
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/zm_signal.cpp
+7 -6
View File
@@ -59,9 +59,11 @@ RETSIGTYPE zm_die_handler(int signal)
info->si_status);
#endif
// Get signal address and instruction pointer if available
#if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
if (info && context) {
ucontext_t *uc = (ucontext_t *) context;
#if defined(__x86_64__)
cr2 = info->si_addr;
@@ -70,18 +72,17 @@ RETSIGTYPE zm_die_handler(int signal)
cr2 = info->si_addr;
ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
#endif // defined(__x86_64__)
}
#endif // ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
// Print the signal address and instruction pointer if available
if (cr2) {
// Print the signal address and instruction pointer if available
if (ip) {
Error("Signal address is %p, from %p", cr2, ip);
} else {
Error("Signal address is %p, no instruction pointer",
cr2);
Error("Signal address is %p, no instruction pointer", cr2);
}
}
#endif // ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
// Print backtrace if enabled and available
#if ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
void *trace[TRACE_SIZE];