Deadlock on zmq_close

1 files changed, 6 insertions, 3 deletions

diff --git a/src/fd_signaler.cpp b/src/fd_signaler.cpp
index 79696a3..a10872d 100644
--- a/src/fd_signaler.cpp
+++ b/src/fd_signaler.cpp
@@ -78,10 +78,13 @@ uint64_t zmq::fd_signaler_t::poll ()
     ssize_t sz;
     while (true) {
         sz = read (fd, &signals, sizeof (uint64_t));
-        if (sz == 0 || (errno != EAGAIN && errno != EINTR))
-            break;
+        if (sz == -1) {
+            if (errno == EAGAIN || errno == EINTR)
+                continue;
+            zmq_assert (false);
+        }
+        break;
     }
-    errno_assert (sz != -1);
 
     //  Set to non-blocking mode.
     rc = fcntl (fd, F_SETFL, flags | O_NONBLOCK);