]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dict: Avoid potentially using 100% CPU
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 13 Jun 2016 14:59:01 +0000 (17:59 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 13 Jun 2016 15:00:05 +0000 (18:00 +0300)
Continuing 65c570f18 fix.

src/dict/dict-connection.c

index 44d5815fe6e292745086d4fec340b6096327fdac..29124cf16bec38c920af69667b8ee258907c06cd 100644 (file)
@@ -113,6 +113,9 @@ static void dict_connection_input_more(struct dict_connection *conn)
        const char *line;
        int ret;
 
+       if (conn->to_input != NULL)
+               timeout_remove(&conn->to_input);
+
        while ((line = i_stream_next_line(conn->input)) != NULL) {
                T_BEGIN {
                        ret = dict_command_input(conn, line);
@@ -134,9 +137,6 @@ static void dict_connection_input(struct dict_connection *conn)
 {
        const char *line;
 
-       if (conn->to_input != NULL)
-               timeout_remove(&conn->to_input);
-
        switch (i_stream_read(conn->input)) {
        case 0:
                return;