mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-03 12:30:35 +01:00
Move _dbus_disable_crash_handling() back into test/ directory
It's only used in test code. We have to put it in its own translation unit with no non-libc dependencies so that we can compile a copy of it without AddressSanitizer support, because in a subsequent commit we will special-case test-segfault to be compiled without using AddressSanitizer, which would make linking to an AddressSanitizer-instrumented libdbus fail. Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
parent
c3d15a9ead
commit
64f94d3f5b
9 changed files with 161 additions and 55 deletions
|
|
@ -7,6 +7,8 @@ add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
|
|||
set(DBUS_SESSION_BUS_LISTEN_ADDRESS ${TEST_LISTEN})
|
||||
|
||||
add_library(dbus-testutils STATIC
|
||||
${TEST_DIR}/disable-crash-handling.c
|
||||
${TEST_DIR}/disable-crash-handling.h
|
||||
${TEST_DIR}/test-utils.h
|
||||
${TEST_DIR}/test-utils.c
|
||||
)
|
||||
|
|
@ -46,7 +48,12 @@ set (test-exit_SOURCES
|
|||
${TEST_DIR}/test-exit.c
|
||||
)
|
||||
|
||||
# We have to compile a separate copy of disable-crash-handling.c for
|
||||
# test-segfault rather than using the libdbus-testutils library, because
|
||||
# otherwise it would fail to link when using the AddressSanitizer.
|
||||
set (test-segfault_SOURCES
|
||||
${TEST_DIR}/disable-crash-handling.c
|
||||
${TEST_DIR}/disable-crash-handling.h
|
||||
${TEST_DIR}/test-segfault.c
|
||||
)
|
||||
|
||||
|
|
@ -70,7 +77,10 @@ add_test_executable(test-printf ${TEST_DIR}/internals/printf.c dbus-testutils)
|
|||
add_helper_executable(test-shell-service ${test-shell-service_SOURCES} dbus-testutils)
|
||||
add_helper_executable(test-spawn ${test-spawn_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(test-segfault ${test-segfault_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
# the second argument of add_helper_executable() is a whitespace-separated
|
||||
# list of source files and the third and subsequent arguments are libraries
|
||||
# to link, hence the quoting here
|
||||
add_helper_executable(test-segfault "${test-segfault_SOURCES}")
|
||||
add_helper_executable(test-sleep-forever ${test-sleep-forever_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-tcp ${manual-tcp_SOURCES} ${DBUS_INTERNAL_LIBRARIES})
|
||||
add_helper_executable(manual-backtrace ${TEST_DIR}/manual-backtrace.c dbus-1)
|
||||
|
|
|
|||
|
|
@ -1587,28 +1587,3 @@ _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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1688,27 +1688,3 @@ _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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -732,8 +732,6 @@ void _dbus_combine_tcp_errors (DBusList **sources,
|
|||
const char *port,
|
||||
DBusError *dest);
|
||||
|
||||
void _dbus_disable_crash_handling (void);
|
||||
|
||||
/** @} */
|
||||
|
||||
DBUS_END_DECLS
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ AM_CFLAGS = \
|
|||
noinst_LTLIBRARIES = libdbus-testutils.la
|
||||
|
||||
libdbus_testutils_la_SOURCES = \
|
||||
disable-crash-handling.c \
|
||||
disable-crash-handling.h \
|
||||
test-utils.c \
|
||||
test-utils.h \
|
||||
$(NULL)
|
||||
|
|
@ -107,8 +109,14 @@ 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
|
||||
# We have to compile a separate copy of disable-crash-handling.c for
|
||||
# test-segfault rather than using libdbus-testutils.la, because
|
||||
# otherwise it would fail to link when using the AddressSanitizer.
|
||||
test_segfault_SOURCES = \
|
||||
disable-crash-handling.c \
|
||||
disable-crash-handling.h \
|
||||
test-segfault.c \
|
||||
$(NULL)
|
||||
|
||||
test_server_oom_SOURCES = internals/server-oom.c
|
||||
test_server_oom_LDADD = libdbus-testutils.la $(GLIB_LIBS)
|
||||
|
|
|
|||
109
test/disable-crash-handling.c
Normal file
109
test/disable-crash-handling.c
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* Copyright 2003 Red Hat, Inc.
|
||||
* Copyright 2007-2016 Ralf Habacker
|
||||
* Copyright 2014-2018 Collabora Ltd.
|
||||
* Copyright 2016 Yiyang Fei
|
||||
*
|
||||
* Licensed under the Academic Free License version 2.1
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/*
|
||||
* This test utility function is separated from test-utils.h because it
|
||||
* needs to be used by test-segfault, which deliberately crashes itself.
|
||||
*
|
||||
* test-segfault can't be linked to non-self-contained dbus code because
|
||||
* we want to avoid building it with the AddressSanitizer even if we are
|
||||
* using the AddressSanitizer for the rest of dbus, so that the
|
||||
* AddressSanitizer doesn't turn raise(SIGSEGV) into the equivalent of
|
||||
* _exit(1), causing the test that uses test-segfault to see an unexpected
|
||||
* exit status.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "disable-crash-handling.h"
|
||||
|
||||
#ifdef DBUS_WIN
|
||||
|
||||
#include <stdio.h>
|
||||
#include <windows.h>
|
||||
|
||||
#include <dbus/dbus-macros.h>
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
#else /* !DBUS_WIN */
|
||||
|
||||
#ifdef HAVE_SYS_PRCTL_H
|
||||
#include <sys/prctl.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#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
|
||||
}
|
||||
|
||||
#endif /* !DBUS_WIN */
|
||||
29
test/disable-crash-handling.h
Normal file
29
test/disable-crash-handling.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/*
|
||||
* Copyright 2003 Red Hat, Inc.
|
||||
* Copyright 2007-2016 Ralf Habacker
|
||||
* Copyright 2014-2018 Collabora Ltd.
|
||||
* Copyright 2016 Yiyang Fei
|
||||
*
|
||||
* Licensed under the Academic Free License version 2.1
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef TEST_DISABLE_CRASH_HANDLING_H
|
||||
#define TEST_DISABLE_CRASH_HANDLING_H
|
||||
|
||||
void _dbus_disable_crash_handling (void);
|
||||
|
||||
#endif
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <dbus/dbus.h>
|
||||
#include "dbus/dbus-internals.h"
|
||||
#include "disable-crash-handling.h"
|
||||
#include "test-utils-glib.h"
|
||||
|
||||
typedef struct
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
#include "dbus/dbus-sysdeps.h"
|
||||
#include "disable-crash-handling.h"
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue