[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-save.c, 1.78, 1.79

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv32460

Modified Files:
	mbox-save.c 
Log Message:
Don't crash while saving message if keywords aren't given..



Index: mbox-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-save.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- mbox-save.c	3 Apr 2005 11:36:17 -0000	1.78
+++ mbox-save.c	7 Apr 2005 22:04:53 -0000	1.79
@@ -234,13 +234,14 @@
 	const array_t *keyword_names_list;
 	ARRAY_SET_TYPE(keyword_names_list, const char *);
 	const char *const *keyword_names;
-	unsigned int i, keyword_names_count;
+	unsigned int i, count, keyword_names_count;
 
 	keyword_names_list = mail_index_get_keywords(ctx->ibox->index);
 	keyword_names = array_get(keyword_names_list, &keyword_names_count);
 
 	str_append(ctx->headers, "X-Keywords:");
-	for (i = 0; i < keywords->count; i++) {
+	count = keywords == NULL ? 0 : keywords->count;
+	for (i = 0; i < count; i++) {
 		i_assert(keywords->idx[i] < keyword_names_count);
 
 		str_append_c(ctx->headers, ' ');