dovecot-2.2: imap: Fixed crashes in THREAD=ORDEREDSUBJECT

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/1309de301a2e
changeset: 14977:1309de301a2e
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 29 20:16:13 2012 +0300
description:
imap: Fixed crashes in THREAD=ORDEREDSUBJECT

diffstat:

 src/imap/cmd-thread.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 8d95535af98e -r 1309de301a2e src/imap/cmd-thread.c
--- a/src/imap/cmd-thread.c	Wed Aug 29 20:00:03 2012 +0300
+++ b/src/imap/cmd-thread.c	Wed Aug 29 20:16:13 2012 +0300
@@ -178,7 +178,8 @@
 	const struct orderedsubject_thread *thread;
 	struct orderedsubject_thread *cur_thread = NULL;
 	uint32_t num;
-	int ret;
+	bool reply_or_fw;
+	int ret, tz;
 
 	prev_subject = str_new(default_pool, 128);
 
@@ -193,7 +194,8 @@
 			subject = "";
 		T_BEGIN {
 			base_subject = imap_get_base_subject_cased(
-					pool_datastack_create(), subject, NULL);
+					pool_datastack_create(), subject,
+					&reply_or_fw);
 			if (strcmp(str_c(prev_subject), base_subject) != 0) {
 				/* thread changed */
 				cur_thread = NULL;
@@ -206,7 +208,8 @@
 			/* starting a new thread. get the first message's
 			   date */
 			cur_thread = array_append_space(&threads);
-			if (mail_get_date(mail, &cur_thread->timestamp, NULL) == 0 &&
+			if (mail_get_date(mail, &cur_thread->timestamp,
+					  &tz) == 0 &&
 			    cur_thread->timestamp == 0) {
 				(void)mail_get_received_date(mail,
 					&cur_thread->timestamp);