2013-01-23 [colin] 3.9.0cvs58
authorColin Leroy <colin@colino.net>
Wed, 23 Jan 2013 09:03:07 +0000 (09:03 +0000)
committerColin Leroy <colin@colino.net>
Wed, 23 Jan 2013 09:03:07 +0000 (09:03 +0000)
* src/imap.c
Fix bug #2863, "Applying has_attachment quicksearch
on IMAP segfaults".

ChangeLog
PATCHSETS
configure.ac
src/imap.c

index 2c1a58be448e61bc6b9ea412edf2108c06ab3643..52d061f5f41302b6c126856fe5cff057bcbbb8bd 100644 (file)
--- 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
index 0ed0fd3ebfb5285cc89aeb5623fdf4c12cf2ec17..a81259450e446485f45a551857fce74d2b30baf5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 7710d49603c3ec9a7e4fa6842e9335a8082ea891..0d81aaf70076e03340131a158ff4d80d3416bf7c 100644 (file)
@@ -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=
 
index a7fdb0a921a81859a70d403d5af363f15bcbf22f..7c671e544606e40aa0eed9c37c734ffc2f45c4e5 100644 (file)
@@ -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,