* exceptions.cc (call_signal_handler_now): Add additional guard against

inappropriately calling signal handler.
* syscalls.cc (_read): Reset errno if not exiting due to signal.

1 files changed, 6 insertions, 0 deletions

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index bf4a4446e..37607cd8e 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1127,6 +1127,12 @@ extern "C" {
 static int __stdcall
 call_signal_handler_now ()
 {
+  if (!sigsave.sig)
+    {
+      sigproc_printf ("call_signal_handler_now called when no signal active");
+      return 0;
+    }
+
   int sa_flags = sigsave.sa_flags;
   sigproc_printf ("sa_flags %p", sa_flags);
   *sigsave.retaddr_on_stack = sigsave.retaddr;