From cfa228a3d4b300df3551e811028508d3de5cd81c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 28 Oct 2009 13:35:10 -0700 Subject: [PATCH] notmuch_database_add_message: Sanity check the file as the first thing This avoids us wasting a bunch of time doing an expensive SHA-1 over a large file only to discover later that it doesn't even *look* like an email message. --- database.cc | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/database.cc b/database.cc index f01ffa4b..d7cd26c7 100644 --- a/database.cc +++ b/database.cc @@ -881,7 +881,25 @@ notmuch_database_add_message (notmuch_database_t *notmuch, (char *) NULL); try { - /* The first order of business is to find/create a message ID. */ + /* Before we do any real work, (especially before doing a + * potential SHA-1 computation on the entire file's contents), + * let's make sure that what we're looking at looks like an + * actual email message. + */ + from = notmuch_message_file_get_header (message_file, "from"); + subject = notmuch_message_file_get_header (message_file, "subject"); + to = notmuch_message_file_get_header (message_file, "to"); + + if (from == NULL && + subject == NULL && + to == NULL) + { + ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; + goto DONE; + } + + /* Now that we're sure it's mail, the first order of business + * is to find a message ID (or else create one ourselves). */ header = notmuch_message_file_get_header (message_file, "message-id"); if (header) { @@ -938,18 +956,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch, date = notmuch_message_file_get_header (message_file, "date"); _notmuch_message_set_date (message, date); - from = notmuch_message_file_get_header (message_file, "from"); - subject = notmuch_message_file_get_header (message_file, "subject"); - to = notmuch_message_file_get_header (message_file, "to"); - - if (from == NULL && - subject == NULL && - to == NULL) - { - ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; - goto DONE; - } - _notmuch_message_index_file (message, filename); _notmuch_message_sync (message); -- 2.43.0