client: check "expired" flag again in client_write_output()

When client_defer_output() aborts the connection to the client, client_write_output() called client_write_deferred() anyway. This caused an assertion failure. Fix it by checking for the "expired" flag again after client_defer_output() returns.

client: check "expired" flag again in client_write_output()
faaf9daf · Max Kellermann · 427dd816 · faaf9daf
Commit faaf9daf authored Jun 04, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

client.c src/client.c +3 -0

No files found.
--- a/src/client.c
+++ b/src/client.c
@@ -776,6 +776,9 @@ static void client_write_output(struct client *client)
 		client_defer_output(client, client->send_buf,
 				    client->send_buf_used);

+		if (client_is_expired(client))
+			return;
+
 		/* try to flush the deferred buffers now; the current
 		   server command may take too long to finish, and
 		   meanwhile try to feed output to the client,