Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2015-11-30 12:29:13 -0500
committerAllan McRae <allan@archlinux.org>2015-12-05 18:08:43 +1000
commit220a3ce2b8177bb3cc8a7a20715b67d5cbf7fc71 (patch)
treebb60866f24d24ba3bd26014f9142c3b4b58170b7 /src
parent8d11aa3cdf284ebd5b0239b3e3e2f0c39ec7c3ba (diff)
avoid unsafe functions in signal handler
signal(7) lists a set of functions that can safely be called from within a signal handler. Even fileno and strlen are not guaranteed to be safe. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/pacman.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 05b8cd31..ba86dec0 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -311,21 +311,19 @@ static ssize_t xwrite(int fd, const void *buf, size_t count)
*/
static void handler(int signum)
{
- int out = fileno(stdout);
- int err = fileno(stderr);
- const char *msg;
if(signum == SIGSEGV) {
- msg = "\nerror: segmentation fault\n"
+ const char msg[] = "\nerror: segmentation fault\n"
"Please submit a full bug report with --debug if appropriate.\n";
- xwrite(err, msg, strlen(msg));
+ xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1);
exit(signum);
} else if(signum == SIGINT || signum == SIGHUP) {
if(signum == SIGINT) {
- msg = "\nInterrupt signal received\n";
+ const char msg[] = "\nInterrupt signal received\n";
+ xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1);
} else {
- msg = "\nHangup signal received\n";
+ const char msg[] = "\nHangup signal received\n";
+ xwrite(STDERR_FILENO, msg, ARRAYSIZE(msg) - 1);
}
- xwrite(err, msg, strlen(msg));
if(alpm_trans_interrupt(config->handle) == 0) {
/* a transaction is being interrupted, don't exit pacman yet. */
return;
@@ -337,7 +335,7 @@ static void handler(int signum)
/* SIGINT/SIGHUP: no committing transaction, release it now and then exit pacman */
alpm_unlock(config->handle);
/* output a newline to be sure we clear any line we may be on */
- xwrite(out, "\n", 1);
+ xwrite(STDOUT_FILENO, "\n", 1);
_Exit(128 + signum);
}