debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add_message: Don't add any self-references to the database.

Browse source 
In our scheme it's illegal for any message to refer to itself, (nor
would it be useful for anything anyway). Cut these self-references off
at the source, before they trip up any internal errors.
This commit is contained in:
Carl Worth 2009-11-17 17:20:32 -08:00
parent f7eaeff242
commit 64c03ae97f
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/database.cc
View file

@ -371,9 +371,16 @@ _parse_message_id (void *ctx, const char *message_id, const char **next)
} }
/* Parse a References header value, putting a (talloc'ed under 'ctx') /* Parse a References header value, putting a (talloc'ed under 'ctx')
* copy of each referenced message-id into 'hash'. */ * copy of each referenced message-id into 'hash'.
*
* We explicitly avoid including any reference identical to
* 'message_id' in the result (to avoid mass confusion when a single
* message references itself cyclically---and yes, mail messages are
* not infrequent in the wild that do this---don't ask me why).
*/
static void static void
parse_references (void *ctx, parse_references (void *ctx,
const char *message_id,
GHashTable *hash, GHashTable *hash,
const char *refs) const char *refs)
{ {
@ -385,7 +392,7 @@ parse_references (void *ctx,
while (*refs) { while (*refs) {
ref = _parse_message_id (ctx, refs, &refs); ref = _parse_message_id (ctx, refs, &refs);
if (ref) if (ref && strcmp (ref, message_id))
g_hash_table_insert (hash, ref, NULL); g_hash_table_insert (hash, ref, NULL);
} }
} }
@ -697,7 +704,7 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
const char **thread_id) const char **thread_id)
{ {
GHashTable *parents = NULL; GHashTable *parents = NULL;
const char *refs, *in_reply_to; const char *refs, *in_reply_to, *in_reply_to_message_id;
GList *l, *keys = NULL; GList *l, *keys = NULL;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
@ -705,12 +712,21 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,
_my_talloc_free_for_g_hash, NULL); _my_talloc_free_for_g_hash, NULL);
refs = notmuch_message_file_get_header (message_file, "references"); refs = notmuch_message_file_get_header (message_file, "references");
parse_references (message, parents, refs); parse_references (message, notmuch_message_get_message_id (message),
parents, refs);
in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to"); in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");
parse_references (message, parents, in_reply_to); parse_references (message, notmuch_message_get_message_id (message),
parents, in_reply_to);
/* Carefully avoid adding any self-referential in-reply-to term. */
in_reply_to_message_id = _parse_message_id (message, in_reply_to, NULL);
if (strcmp (in_reply_to_message_id,
notmuch_message_get_message_id (message)))
{
_notmuch_message_add_term (message, "replyto", _notmuch_message_add_term (message, "replyto",
_parse_message_id (message, in_reply_to, NULL)); _parse_message_id (message, in_reply_to, NULL));
}
keys = g_hash_table_get_keys (parents); keys = g_hash_table_get_keys (parents);
for (l = keys; l; l = l->next) { for (l = keys; l; l = l->next) {

2
lib/messages.c
View file

@ -47,7 +47,7 @@ _notmuch_message_list_create (const void *ctx)
return list; return list;
} }
/* Append 'node' (which can of course point to an aribtrarily long /* Append 'node' (which can of course point to an arbitrarily long
* list of nodes) to the end of 'list'. * list of nodes) to the end of 'list'.
*/ */
void void