aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2001-08-08 22:34:33 +0800
committerJacob Berkman <jberkman@src.gnome.org>2001-08-08 22:34:33 +0800
commitdd1fd6f7f6f3e511f3271792135cb1f26afed43f (patch)
tree8e503151b1352f89eee574e60f419291722ce37b
parent692b8961b8088e426d93fe97fe155df7527f0a41 (diff)
downloadgsoc2013-evolution-dd1fd6f7f6f3e511f3271792135cb1f26afed43f.tar.gz
gsoc2013-evolution-dd1fd6f7f6f3e511f3271792135cb1f26afed43f.tar.zst
gsoc2013-evolution-dd1fd6f7f6f3e511f3271792135cb1f26afed43f.zip
check for NULL name and addr (fixes a bug i was about to report)
2001-08-08 jacob berkman <jacob@ximian.com> * camel-search-private.c (camel_search_header_match): check for NULL name and addr (fixes a bug i was about to report) svn path=/trunk/; revision=11786
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-search-private.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 5c755c3191..80c7053000 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-08 jacob berkman <jacob@ximian.com>
+
+ * camel-search-private.c (camel_search_header_match): check for
+ NULL name and addr (fixes a bug i was about to report)
+
2001-08-08 Not Zed <NotZed@Ximian.com>
* camel-filter-search.c (check_header): Properly determine match
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index b769a03e33..be90e69d99 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -425,8 +425,8 @@ camel_search_header_match (const char *value, const char *match, camel_search_ma
if (camel_address_length((CamelAddress *)cia) == 1) {
camel_internet_address_get(cia, 0, &name, &addr);
- truth = header_match(name, match, how)
- || header_match(addr, match, how);
+ truth = (name && header_match(name, match, how))
+ || (addr && header_match(addr, match, how));
}
camel_object_unref((CamelObject *)cia);
break;