Mercurial > dovecot > core-2.2

changeset 15283:88a05f387743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdbox: Don't crash in storage rebuild if mail's "original mailbox" metadata is missing.
author Timo Sirainen <tss@iki.fi>
date Thu, 27 Sep 2012 02:55:14 +0300
parents 4819306a1f9f
children 75aadea5c2a2
files src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Thu Sep 27 00:19:41 2012 +0300
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c	Thu Sep 27 02:55:14 2012 +0300
@@ -605,8 +605,10 @@
 	if (ret > 0 && !deleted && dbox_file_metadata_read(file) > 0) {
 		mailbox = dbox_file_metadata_get(file,
 						 DBOX_METADATA_ORIG_MAILBOX);
-		mailbox = mailbox_list_get_vname(ctx->default_list, mailbox);
-		mailbox = t_strdup(mailbox);
+		if (mailbox != NULL) {
+			mailbox = mailbox_list_get_vname(ctx->default_list, mailbox);
+			mailbox = t_strdup(mailbox);
+		}
 	}
 	dbox_file_unref(&file);
 	if (ret <= 0 || deleted) {