add_message: Re-fix handling of non-mail files.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 726c5a98a02b1e153358c0daff820dac8cac3cc3..207246cc5dc0387a04083c460b869515614fd970 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -323,7 +323,7 @@ _parse_message_id (void *ctx, const char *message_id, const char **next)
     const char *s, *end;
     char *result;
 
-    if (message_id == NULL)
+    if (message_id == NULL || *message_id == '\0')
        return NULL;
 
     s = message_id;
@@ -391,7 +391,7 @@ parse_references (void *ctx,
 {
     char *ref;
 
-    if (refs == NULL)
+    if (refs == NULL || *refs == '\0')
        return;
 
     while (*refs) {
@@ -896,9 +896,9 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
        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)
+       if ((from == NULL || *from == '\0') &&
+           (subject == NULL || *subject == '\0') &&
+           (to == NULL || *to == '\0'))
        {
            ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
            goto DONE;
@@ -908,7 +908,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
         * is to find a message ID (or else create one ourselves). */
 
        header = notmuch_message_file_get_header (message_file, "message-id");
-       if (header) {
+       if (header && *header != '\0') {
            message_id = _parse_message_id (message_file, header, NULL);
            /* So the header value isn't RFC-compliant, but it's
             * better than no message-id at all. */
@@ -940,8 +940,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
        talloc_free (message_id);
 
-       if (message == NULL)
+       if (message == NULL) {
+           ret = COERCE_STATUS (private_status,
+                                "Unexpected status value from _notmuch_message_create_for_message_id");
            goto DONE;
+       }
 
        /* Is this a newly created message object? */
        if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {