talons

commit 4e0e3643ec74297b135f50f4314f6d0d82326adf
parent 205b490083a141586c390bd985a3e22e99ea137d
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 23 Jan 2013 09:03:07 +0000

2013-01-23 [colin]	3.9.0cvs58

	* src/imap.c
		Fix bug #2863, "Applying has_attachment quicksearch
		on IMAP segfaults".

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/imap.c
 | 
1
+

4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-23 [colin]	3.9.0cvs58
+
+	* src/imap.c
+		Fix bug #2863, "Applying has_attachment quicksearch
+		on IMAP segfaults".
+
 2013-01-21 [paul]	3.9.0cvs57
 
 	* src/codeconv.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -4555,3 +4555,4 @@
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 doc/man/claws-mail.1;  cvs diff -u -r 1.4.2.87 -r 1.4.2.88 src/gtk/about.c;  ) > 3.9.0cvs55.patchset
 ( cvs diff -u -r 1.9.2.61 -r 1.9.2.62 src/common/defs.h;  cvs diff -u -r 1.4.2.88 -r 1.4.2.89 src/gtk/about.c;  ) > 3.9.0cvs56.patchset
 ( cvs diff -u -r 1.15.2.29 -r 1.15.2.30 src/codeconv.h;  cvs diff -u -r 1.49.2.154 -r 1.49.2.155 src/procmime.c;  ) > 3.9.0cvs57.patchset
+( cvs diff -u -r 1.179.2.270 -r 1.179.2.271 src/imap.c;  ) > 3.9.0cvs58.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -2219,6 +2219,7 @@ static MatcherProp *imap_matcher_prop_set_charset(IMAPFolder *folder,
 	if (imap_matcher_type_is_local(utf8_prop->criteria)
 	 || utf8_prop->criteria == MATCHCRITERIA_TAG
 	 || utf8_prop->criteria == MATCHCRITERIA_NOT_TAG
+	 || utf8_prop->expr == NULL
 	 || is_ascii_str(utf8_prop->expr))
 		return matcherprop_new(utf8_prop->criteria,
 			       utf8_prop->header,