Honor blocked signals during rpmsqPoll() too

Queued signals might get processed much much later than they arrive,
and almost anything can happen in the meanwhile. Such as program
blocking signals before entering a critical piece of code, which
routinely calls rpmsqPoll() underneath since the code is not always
critical. Such as rpmdb iterator init/free - sometimes they're
called during harmless read-only query, at other times they're in
middle of transaction...

1 files changed, 3 insertions, 0 deletions

diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index c2efb4714..0eb3ca37a 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -143,6 +143,9 @@ int rpmsqPoll(void)
     (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask);
 
     for (rpmsig tbl = rpmsigTbl; tbl->signum >= 0; tbl++) {
+	/* honor blocked signals in polling too */
+	if (sigismember(&oldMask, tbl->signum))
+	    continue;
 	if (sigismember(&rpmsqCaught, tbl->signum)) {
 	    rpmsqAction_t handler = (tbl->handler != NULL) ? tbl->handler :
 							     tbl->defhandler;