diff options
author | Simon McVittie <smcv@collabora.com> | 2018-11-20 12:48:40 +0000 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2018-11-20 12:58:17 +0000 |
commit | 77327b7bd897985261315e38e8524c21c266b1f0 (patch) | |
tree | 8884e769491908e678464bc6085d055f882d3827 | |
parent | 16d2453ffada1d0c84996f392c7e4cad091da715 (diff) |
_dbus_disable_crash_handling: Factor out from test-segfault
Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 29 | ||||
-rw-r--r-- | dbus/dbus-sysdeps-util-win.c | 24 | ||||
-rw-r--r-- | dbus/dbus-sysdeps.h | 2 | ||||
-rw-r--r-- | test/Makefile.am | 3 | ||||
-rw-r--r-- | test/test-segfault.c | 53 |
5 files changed, 60 insertions, 51 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 262dcfde..3e74cf17 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -52,6 +52,10 @@ #include <dirent.h> #include <sys/un.h> +#ifdef HAVE_SYS_PRCTL_H +#include <sys/prctl.h> +#endif + #ifdef HAVE_SYS_SYSLIMITS_H #include <sys/syslimits.h> #endif @@ -1583,3 +1587,28 @@ _dbus_daemon_report_stopping (void) sd_notify (0, "STOPPING=1"); #endif } + +/** + * Try to disable core dumps and similar special crash handling. + */ +void +_dbus_disable_crash_handling (void) +{ +#ifdef HAVE_SETRLIMIT + /* No core dumps please, we know we crashed. */ + struct rlimit r = { 0, }; + + getrlimit (RLIMIT_CORE, &r); + r.rlim_cur = 0; + setrlimit (RLIMIT_CORE, &r); +#endif + +#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) + /* Really, no core dumps please. On Linux, if core_pattern is + * set to a pipe (for abrt/apport/corekeeper/etc.), RLIMIT_CORE of 0 + * is ignored (deliberately, so people can debug init(8) and other + * early stuff); but Linux has PR_SET_DUMPABLE, so we can avoid core + * dumps anyway. */ + prctl (PR_SET_DUMPABLE, 0, 0, 0, 0); +#endif +} diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index fc356908..0182b6b1 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1688,3 +1688,27 @@ _dbus_win_stderr_win_error (const char *app, fprintf (stderr, "%s: %s: %s\n", app, message, error.message); dbus_error_free (&error); } + +static int exception_handler (LPEXCEPTION_POINTERS p) _DBUS_GNUC_NORETURN; + +static int +exception_handler (LPEXCEPTION_POINTERS p) +{ + ExitProcess (0xc0000005); +} + +/** + * Try to disable core dumps and similar special crash handling. + */ +void +_dbus_disable_crash_handling (void) +{ + /* Disable Windows popup dialog when an app crashes so that app quits + * immediately with error code instead of waiting for user to dismiss + * the dialog. */ + DWORD dwMode = SetErrorMode (SEM_NOGPFAULTERRORBOX); + + SetErrorMode (dwMode | SEM_NOGPFAULTERRORBOX); + /* Disable "just in time" debugger */ + SetUnhandledExceptionFilter ((LPTOP_LEVEL_EXCEPTION_FILTER) &exception_handler); +} diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index fa20219e..9965c6e4 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -732,6 +732,8 @@ void _dbus_combine_tcp_errors (DBusList **sources, const char *port, DBusError *dest); +void _dbus_disable_crash_handling (void); + /** @} */ DBUS_END_DECLS diff --git a/test/Makefile.am b/test/Makefile.am index e439bfe4..59d43609 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -105,6 +105,9 @@ test_printf_LDADD = $(top_builddir)/dbus/libdbus-internal.la test_refs_SOURCES = internals/refs.c test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) +test_segfault_SOURCES = test-segfault.c +test_segfault_LDADD = $(top_builddir)/dbus/libdbus-internal.la + test_server_oom_SOURCES = internals/server-oom.c test_server_oom_LDADD = libdbus-testutils.la $(GLIB_LIBS) diff --git a/test/test-segfault.c b/test/test-segfault.c index 8517dd6c..a11d45b2 100644 --- a/test/test-segfault.c +++ b/test/test-segfault.c @@ -5,63 +5,14 @@ #include <signal.h> #endif -#ifdef HAVE_SETRLIMIT -#include <sys/resource.h> -#endif - -#ifdef HAVE_SYS_PRCTL_H -#include <sys/prctl.h> -#endif - -#ifdef DBUS_WIN -#include <stdio.h> -#include <windows.h> - -#include <dbus/dbus-macros.h> - -int exception_handler (LPEXCEPTION_POINTERS p) _DBUS_GNUC_NORETURN; - -/* Explicit Windows exception handlers needed to supress OS popups */ -int -exception_handler(LPEXCEPTION_POINTERS p) -{ - fprintf(stderr, "test-segfault: raised fatal exception as intended\n"); - ExitProcess(0xc0000005); -} -#endif +#include "dbus/dbus-sysdeps.h" int main (int argc, char **argv) { char *p; -#ifdef DBUS_WIN - /* Disable Windows popup dialog when an app crashes so that app quits - * immediately with error code instead of waiting for user to dismiss - * the dialog. */ - DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX); - SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX); - /* Disable "just in time" debugger */ - SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER)&exception_handler); -#endif - -#ifdef HAVE_SETRLIMIT - /* No core dumps please, we know we crashed. */ - struct rlimit r = { 0, }; - - getrlimit (RLIMIT_CORE, &r); - r.rlim_cur = 0; - setrlimit (RLIMIT_CORE, &r); -#endif - -#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) - /* Really, no core dumps please. On Linux, if core_pattern is - * set to a pipe (for abrt/apport/corekeeper/etc.), RLIMIT_CORE of 0 - * is ignored (deliberately, so people can debug init(8) and other - * early stuff); but Linux has PR_SET_DUMPABLE, so we can avoid core - * dumps anyway. */ - prctl (PR_SET_DUMPABLE, 0, 0, 0, 0); -#endif + _dbus_disable_crash_handling (); #ifdef HAVE_RAISE raise (SIGSEGV); |