From 691f4f5c3b86c82996ee93bde1a3281ae04beafe Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 21 Nov 2016 19:04:26 +0200
Subject: [PATCH] dict: Make sure iterate doesn't add to ostream when it's
 already full.

---
 src/dict/dict-commands.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/dict/dict-commands.c b/src/dict/dict-commands.c
index b39a0200a6..97ea9394c7 100644
--- a/src/dict/dict-commands.c
+++ b/src/dict/dict-commands.c
@@ -151,11 +151,29 @@ static int cmd_lookup(struct dict_connection_cmd *cmd, const char *line)
 	return 1;
 }
 
+static bool dict_connection_flush_if_full(struct dict_connection *conn)
+{
+	if (o_stream_get_buffer_used_size(conn->output) >
+	    DICT_OUTPUT_OPTIMAL_SIZE) {
+		if (o_stream_flush(conn->output) <= 0) {
+			/* continue later when there's more space
+			   in output buffer */
+			o_stream_set_flush_pending(conn->output, TRUE);
+			return FALSE;
+		}
+		/* flushed everything, continue */
+	}
+	return TRUE;
+}
+
 static int cmd_iterate_flush(struct dict_connection_cmd *cmd)
 {
 	string_t *str;
 	const char *key, *value;
 
+	if (!dict_connection_flush_if_full(cmd->conn))
+		return 0;
+
 	str = t_str_new(256);
 	while (dict_iterate(cmd->iter, &key, &value)) {
 		str_truncate(str, 0);
@@ -167,16 +185,8 @@ static int cmd_iterate_flush(struct dict_connection_cmd *cmd)
 		str_append_c(str, '\n');
 		o_stream_nsend(cmd->conn->output, str_data(str), str_len(str));
 
-		if (o_stream_get_buffer_used_size(cmd->conn->output) >
-		    DICT_OUTPUT_OPTIMAL_SIZE) {
-			if (o_stream_flush(cmd->conn->output) <= 0) {
-				/* continue later when there's more space
-				   in output buffer */
-				o_stream_set_flush_pending(cmd->conn->output, TRUE);
-				return 0;
-			}
-			/* flushed everything, continue */
-		}
+		if (!dict_connection_flush_if_full(cmd->conn))
+			return 0;
 	}
 	if (dict_iterate_has_more(cmd->iter)) {
 		/* wait for the next iteration callback */
-- 
2.47.3