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.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/client.c b/src/client.c
index b4aea208..c0cca399 100644
--- 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);
-			else if (ret == COMMAND_RETURN_CLOSE
-				 || client_is_expired(client)) {
+
+			if (ret == COMMAND_RETURN_CLOSE ||
+			    client_is_expired(client)) {
 				client_close(client);
+				return COMMAND_RETURN_CLOSE;
 			}
+
+			if (ret == 0)
+				commandSuccess(client->fd);
+
 			client_write_output(client);
 		}
 	}