lmtp: Fixed crash when multiple mails were saved and second one failed.

--HG--
branch : HEAD

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 5cdfafa13a7d7f3a13087d609504757afc3d2b5b..e8212e4e1c697de418458ebd9537d5ab654d606a 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -606,13 +606,18 @@ client_input_data_write_local(struct client *client, struct istream *input)
 
        /* save the message to the first recipient's mailbox */
        src_mail = client->state.raw_mail;
-       if (!client_deliver_next(client, src_mail))
+       if (!client_deliver_next(client, src_mail)) {
+               /* nothing got saved */
+               i_assert(client->state.first_saved_mail == NULL);
                return;
+       }
 
        if (client->state.first_saved_mail == NULL)
                mail_user_unref(&client->state.dest_user);
-       else
+       else {
+               client->state.dest_user = NULL;
                src_mail = client->state.first_saved_mail;
+       }
 
        /* use the first saved message to save it elsewhere too.
           this might allow hard linking the files. */