From cab70c9e5d8c38260a07bb1ddb7618826a120465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 23 Mar 2012 00:27:04 -0400 Subject: [PATCH] connection: Set n_fds_out to 0 when we send out the fds This needs to happen always, not just when the fd buffer overflows. --- src/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connection.c b/src/connection.c index fa015459..ef8e3ae4 100644 --- a/src/connection.c +++ b/src/connection.c @@ -287,6 +287,7 @@ wl_connection_data(struct wl_connection *connection, uint32_t mask) } close_fds(&connection->fds_out); + connection->n_fds_out = 0; connection->out.tail += len; if (connection->out.tail == connection->out.head && @@ -399,7 +400,6 @@ wl_connection_put_fd(struct wl_connection *connection, int32_t fd) if (connection->n_fds_out + 1 > MAX_FDS_OUT) { if (wl_connection_data(connection, WL_CONNECTION_WRITABLE)) return -1; - connection->n_fds_out = 0; } wl_buffer_put(&connection->fds_out, &fd, sizeof fd);