dovecot-2.2: dsync: Fixed crashes when sending already expunged ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3a395a61f109
changeset: 15658:3a395a61f109
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jan 21 16:57:49 2013 +0200
description:
dsync: Fixed crashes when sending already expunged messages.

diffstat:

 src/doveadm/dsync/dsync-mailbox-import.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f0dbe8fc8905 -r 3a395a61f109 src/doveadm/dsync/dsync-mailbox-import.c
--- a/src/doveadm/dsync/dsync-mailbox-import.c	Mon Jan 21 16:52:49 2013 +0200
+++ b/src/doveadm/dsync/dsync-mailbox-import.c	Mon Jan 21 16:57:49 2013 +0200
@@ -1263,7 +1263,7 @@
 	if (*mail->guid != '\0')
 		mailbox_save_set_guid(save_ctx, mail->guid);
 	dsync_mailbox_save_set_metadata(importer, save_ctx, newmail->change);
-	if (*mail->pop3_uidl != '\0')
+	if (mail->pop3_uidl != NULL && *mail->pop3_uidl != '\0')
 		mailbox_save_set_pop3_uidl(save_ctx, mail->pop3_uidl);
 	if (mail->pop3_order > 0)
 		mailbox_save_set_pop3_order(save_ctx, mail->pop3_order);
@@ -1341,7 +1341,7 @@
 {
 	struct importer_new_mail *newmail, *allmails;
 
-	i_assert(mail->input->seekable);
+	i_assert(mail->input == NULL || mail->input->seekable);
 	i_assert(importer->new_uids_assigned);
 
 	newmail = *mail->guid != '\0' ?