pop3: Don't crash if client disconnects in output handler.

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 66d4eb17eef0458f35399d3e60018306a979555b..125aa60d6983314fa67ca9db86b1688f19f7aae5 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -662,8 +662,12 @@ static int client_output(struct client *client)
                        client->io = io_add(i_stream_get_fd(client->input),
                                            IO_READ, client_input, client);
                }
-               if (client->io != NULL && client->waiting_input)
-                       client_input(client);
+               if (client->io != NULL && client->waiting_input) {
+                       if (!client_handle_input(client)) {
+                               /* client got destroyed */
+                               return 1;
+                       }
+               }
        }
 
        o_stream_uncork(client->output);