From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 17 Mar 2020 12:33:47 +0000 (+0000)
Subject: Avoid corrupting globals during time-pauses
X-Git-Tag: exim-4_94_RC0~55
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=c85879f8174a658ddac9524d078b2a717f964710

Avoid corrupting globals during time-pauses
---

diff --git a/src/src/exim.c b/src/src/exim.c
index 4e4b6bb75..5e2f43799 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -309,6 +309,7 @@ milliwait(struct itimerval *itval)
 {
 sigset_t sigmask;
 sigset_t old_sigmask;
+int save_errno = errno;
 
 if (itval->it_value.tv_usec < 50 && itval->it_value.tv_sec == 0)
   return;
@@ -322,6 +323,8 @@ if (setitimer(ITIMER_REAL, itval, NULL) < 0)           /* Start timer */
 (void)sigdelset(&sigmask, SIGALRM);                    /* Remove SIGALRM */
 (void)sigsuspend(&sigmask);                            /* Until SIGALRM */
 (void)sigprocmask(SIG_SETMASK, &old_sigmask, NULL);    /* Restore mask */
+errno = save_errno;
+sigalrm_seen = FALSE;
 }