github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

The SIGABRT handler can no longer invoke abort() recursively.

Browse Source
This commit is contained in:
obarthel
2023-09-10 11:45:38 +02:00
parent 64ab8643b5
commit 9a9ae7d6fd
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
library/signal_raise.c
View File

@@ -71,7 +71,7 @@ raise(int sig)
assert( SIGABRT <= sig && sig <= SIGTERM );
/* This has to be a well-known and supported signal. */
if(sig < SIGABRT || sig > SIGTERM)
if (sig < SIGABRT || sig > SIGTERM)
{
SHOWMSG("unknown signal number");
@@ -80,48 +80,49 @@ raise(int sig)
}
/* Can we deliver the signal? */
if(FLAG_IS_CLEAR(__signals_blocked, (1 << sig)) &&
FLAG_IS_CLEAR(local_signals_blocked, (1 << sig)))
if (FLAG_IS_CLEAR(__signals_blocked, (1 << sig)) &&
FLAG_IS_CLEAR(local_signals_blocked, (1 << sig)))
{
signal_handler_t handler;
/* Which handler is installed for this signal? */
handler = __signal_handler_table[sig - SIGABRT];
/* Should we ignore this signal? */
if(handler != SIG_IGN)
/* Should we handle this signal rather than ignoring it? */
if (handler != SIG_IGN)
{
/* Block delivery of this signal to prevent recursion. */
SET_FLAG(local_signals_blocked,(1 << sig));
SET_FLAG(local_signals_blocked, (1 << sig));
/* The default behaviour is to drop into abort(), or do
something very much like it. */
if(handler == SIG_DFL)
* something very much like it.
*/
if (handler == SIG_DFL)
{
SHOWMSG("this is the default handler");
if(sig == SIGINT)
if (sig == SIGINT)
{
char break_string[80];
/* Turn off ^C checking for good. */
__check_abort_enabled = FALSE;
Fault(ERROR_BREAK,NULL,break_string,(LONG)sizeof(break_string));
Fault(ERROR_BREAK, NULL, break_string, (LONG)sizeof(break_string));
__print_termination_message(break_string);
SHOWMSG("bye, bye...");
}
/* Drop straight into abort(), which might call signal()
again but is otherwise guaranteed to eventually
land us in _exit(). */
abort();
/* Drop straight into __abort(), which will
eventually land us in _exit(). Note that
abort() calls raise(SIGABRT). */
__abort();
}
else
else
{
SHOWMSG("calling the handler");
SHOWMSG("calling the signal handler");
(*handler)(sig);
@@ -129,7 +130,7 @@ raise(int sig)
}
/* Unblock signal delivery again. */
CLEAR_FLAG(local_signals_blocked,(1 << sig));
CLEAR_FLAG(local_signals_blocked, (1 << sig));
}
}
else

23
library/stdlib_abort.c
View File

@@ -46,15 +46,8 @@
/****************************************************************************/
void
abort(void)
__abort(void)
{
/* Try to call the signal handler that might be in charge of
handling cleanup operations, etc. */
raise(SIGABRT);
/* If the signal handler returns it means that we still have
to terminate the program. */
__check_abort_enabled = FALSE;
__print_termination_message(NULL);
@@ -63,3 +56,17 @@ abort(void)
does not trigger the exit trap. */
_exit(EXIT_FAILURE);
}
/****************************************************************************/
void
abort(void)
{
/* Try to call the signal handler that might be in charge of
handling cleanup operations, etc. */
raise(SIGABRT);
/* If the signal handler returns it means that we still have
to terminate the program. */
__abort();
}