[dovecot-cvs] dovecot/src/imap imap-sort.c,1.22,1.23

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv21848

Modified Files:
	imap-sort.c 
Log Message:
Don't crash if SORT elements don't contain headers.



Index: imap-sort.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/imap-sort.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- imap-sort.c	29 Mar 2005 16:52:57 -0000	1.22
+++ imap-sort.c	17 Apr 2005 15:46:39 -0000	1.23
@@ -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;
 }