Always read again immediately after reading a full recv buffer

uNetworking · Feb 7, 2024 · 833497e · 833497e
1 parent 2c1c6b5
commit 833497e
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/loop.c b/src/loop.c
@@ -351,9 +351,19 @@ void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int events)
                     }
                 }
 
-                int length = bsd_recv(us_poll_fd(&s->p), s->context->loop->data.recv_buf + LIBUS_RECV_BUFFER_PADDING, LIBUS_RECV_BUFFER_LENGTH, 0);
+                int length;
+                read_more:
+                length = bsd_recv(us_poll_fd(&s->p), s->context->loop->data.recv_buf + LIBUS_RECV_BUFFER_PADDING, LIBUS_RECV_BUFFER_LENGTH, 0);
                 if (length > 0) {
                     s = s->context->on_data(s, s->context->loop->data.recv_buf + LIBUS_RECV_BUFFER_PADDING, length);
+
+                    /* If we filled the entire recv buffer, we need to immediately read again since otherwise a
+                     * pending hangup event in the same even loop iteration can close the socket before we get
+                     * the chance to read again next iteration */
+                    if (length == LIBUS_RECV_BUFFER_LENGTH && s && !us_socket_is_closed(0, s)) {
+                        goto read_more;
+                    }
+
                 } else if (!length) {
                     if (us_socket_is_shut_down(0, s)) {
                         /* We got FIN back after sending it */