treat a missing header as if it was set to "".

2004-12-23  Not Zed  <NotZed@Ximian.com>

        * camel-folder-search.c (check_header): treat a missing header as
        if it was set to "".

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9ed8a80..5f9709b 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -40,6 +40,9 @@
 
 2004-12-23  Not Zed  <NotZed@Ximian.com>
 
+       * camel-folder-search.c (check_header): treat a missing header as
+       if it was set to "".
+
        * camel-object.c (camel_object_is, camel_object_class_is)
        (camel_interface_is): check for null values before dereferencing
        them.

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 51597ee..c973d77 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -881,23 +881,24 @@ check_header(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolder
                        e_sexp_fatal_error(f, _("Performing query on unknown header: %s"), headername);
                }
 
-               if (header) {
-                       /* performs an OR of all words */
-                       for (i=1;i<argc && !truth;i++) {
-                               if (argv[i]->type == ESEXP_RES_STRING) {
-                                       if (argv[i]->value.string[0] == 0) {
-                                               truth = TRUE;
-                                       } else if (how == CAMEL_SEARCH_MATCH_CONTAINS) {
-                                               /* doesn't make sense to split words on anything but contains i.e. we can't have an ending match different words */
-                                               words = camel_search_words_split(argv[i]->value.string);
-                                               truth = TRUE;
-                                               for (j=0;j<words->len && truth;j++) {
-                                                       truth = camel_search_header_match(header, words->words[j]->word, how, type, NULL);
-                                               }
-                                               camel_search_words_free(words);
-                                       } else {
-                                               truth = camel_search_header_match(header, argv[i]->value.string, how, type, NULL);
+               if (header == NULL)
+                       header = "";
+
+               /* performs an OR of all words */
+               for (i=1;i<argc && !truth;i++) {
+                       if (argv[i]->type == ESEXP_RES_STRING) {
+                               if (argv[i]->value.string[0] == 0) {
+                                       truth = TRUE;
+                               } else if (how == CAMEL_SEARCH_MATCH_CONTAINS) {
+                                       /* doesn't make sense to split words on anything but contains i.e. we can't have an ending match different words */
+                                       words = camel_search_words_split(argv[i]->value.string);
+                                       truth = TRUE;
+                                       for (j=0;j<words->len && truth;j++) {
+                                               truth = camel_search_header_match(header, words->words[j]->word, how, type, NULL);
                                        }
+                                       camel_search_words_free(words);
+                               } else {
+                                       truth = camel_search_header_match(header, argv[i]->value.string, how, type, NULL);
                                }
                        }
                }