82 lines
2.0 KiB
Diff
82 lines
2.0 KiB
Diff
|
commit 91e7cf982d0104f0e71770f5ae8e3faf352dea9f
|
||
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Thu Oct 5 14:48:16 2017 +0200
|
||
|
|
|
||
|
|
abort: Do not flush stdio streams [BZ #15436]
|
||
|
|
|
||
|
|
diff --git a/stdlib/abort.c b/stdlib/abort.c
|
||
|
|
index 19882f3e3dc1ab83..117a507ff88d8624 100644
|
||
|
|
--- a/stdlib/abort.c
|
||
|
|
+++ b/stdlib/abort.c
|
||
|
|
@@ -31,9 +31,6 @@
|
||
|
|
# define ABORT_INSTRUCTION
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#include <libio/libioP.h>
|
||
|
|
-#define fflush(s) _IO_flush_all_lockp (0)
|
||
|
|
-
|
||
|
|
/* Exported variable to locate abort message in core files etc. */
|
||
|
|
struct abort_msg_s *__abort_msg __attribute__ ((nocommon));
|
||
|
|
libc_hidden_def (__abort_msg)
|
||
|
|
@@ -67,16 +64,8 @@ abort (void)
|
||
|
|
__sigprocmask (SIG_UNBLOCK, &sigs, 0);
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Flush all streams. We cannot close them now because the user
|
||
|
|
- might have registered a handler for SIGABRT. */
|
||
|
|
- if (stage == 1)
|
||
|
|
- {
|
||
|
|
- ++stage;
|
||
|
|
- fflush (NULL);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
/* Send signal which possibly calls a user handler. */
|
||
|
|
- if (stage == 2)
|
||
|
|
+ if (stage == 1)
|
||
|
|
{
|
||
|
|
/* This stage is special: we must allow repeated calls of
|
||
|
|
`abort' when a user defined handler for SIGABRT is installed.
|
||
|
|
@@ -94,7 +83,7 @@ abort (void)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* There was a handler installed. Now remove it. */
|
||
|
|
- if (stage == 3)
|
||
|
|
+ if (stage == 2)
|
||
|
|
{
|
||
|
|
++stage;
|
||
|
|
memset (&act, '\0', sizeof (struct sigaction));
|
||
|
|
@@ -104,30 +93,22 @@ abort (void)
|
||
|
|
__sigaction (SIGABRT, &act, NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Now close the streams which also flushes the output the user
|
||
|
|
- defined handler might has produced. */
|
||
|
|
- if (stage == 4)
|
||
|
|
- {
|
||
|
|
- ++stage;
|
||
|
|
- __fcloseall ();
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
/* Try again. */
|
||
|
|
- if (stage == 5)
|
||
|
|
+ if (stage == 3)
|
||
|
|
{
|
||
|
|
++stage;
|
||
|
|
raise (SIGABRT);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Now try to abort using the system specific command. */
|
||
|
|
- if (stage == 6)
|
||
|
|
+ if (stage == 4)
|
||
|
|
{
|
||
|
|
++stage;
|
||
|
|
ABORT_INSTRUCTION;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* If we can't signal ourselves and the abort instruction failed, exit. */
|
||
|
|
- if (stage == 7)
|
||
|
|
+ if (stage == 5)
|
||
|
|
{
|
||
|
|
++stage;
|
||
|
|
_exit (127);
|