client: check "expired" after command execution

The old code tried to write a response to the client, without even checking if it was already closed. Now that we have added more assertions, these may fail... perform the "expired" check earlier.

client: check "expired" after command execution
e743d71b · Max Kellermann · 76ecc302 · e743d71b
Commit e743d71b authored Aug 29, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

client.c src/client.c +14 -7

No files found.
--- a/src/client.c
+++ b/src/client.c
@@ -343,11 +343,14 @@ static int client_process_line(struct client *client)
 			DEBUG("client %i: process command "
 			      "list returned %i\n", client->num, ret);
+			if (ret == COMMAND_RETURN_CLOSE ||
+			    client_is_expired(client)) {
+				client_close(client);
+				return COMMAND_RETURN_CLOSE;
+			}
 			if (ret == 0)
 				commandSuccess(client->fd);
-			else if (ret == COMMAND_RETURN_CLOSE
-				 || client_is_expired(client))
-				client_close(client);
 			client_write_output(client);
 			free_cmd_list(client->cmd_list);
@@ -385,12 +388,16 @@ static int client_process_line(struct client *client)
 					     &(client->permission), line);
 			DEBUG("client %i: command returned %i\n",
 			      client->num, ret);
-			if (ret == 0)
-				commandSuccess(client->fd);
+			if (ret == COMMAND_RETURN_CLOSE ||
-			else if (ret == COMMAND_RETURN_CLOSE
+			    client_is_expired(client)) {
-				 || client_is_expired(client)) {
 				client_close(client);
+				return COMMAND_RETURN_CLOSE;
 			}
+			if (ret == 0)
+				commandSuccess(client->fd);
 			client_write_output(client);
 		}
 	}