Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3302:701526ef703f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't crash if SORT elements don't contain headers.
author Timo Sirainen <tss@iki.fi>
date Sun, 17 Apr 2005 18:46:39 +0300
parents dd19f2e8575f
children 64814c4d5c7c
files src/imap/imap-sort.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/imap-sort.c	Sun Apr 17 18:43:45 2005 +0300
+++ b/src/imap/imap-sort.c	Sun Apr 17 18:46:39 2005 +0300
@@ -225,8 +225,8 @@
 
 	memset(wanted_headers, 0, sizeof(wanted_headers));
 	wanted_fields = init_sort_elements(ctx, wanted_headers);
-	headers_ctx = mailbox_header_lookup_init(client->mailbox,
-						 wanted_headers);
+	headers_ctx = *wanted_headers == NULL ? NULL :
+		mailbox_header_lookup_init(client->mailbox, wanted_headers);
 
 	/* initialize searching */
 	ctx->t = mailbox_transaction_begin(client->mailbox, 0);
@@ -262,7 +262,8 @@
 			      str_len(ctx->str));
 	}
 
-	mailbox_header_lookup_deinit(headers_ctx);
+	if (headers_ctx != NULL)
+		mailbox_header_lookup_deinit(headers_ctx);
         mail_sort_deinit(ctx);
 	return ret;
 }