X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=2c90019cbee8922bfe9c88541a8aae809c2d6a0f;hb=00c0896c9b9369ec2a844cea4d841be7d4485220;hp=169dc5e20df424c67b9db2a092597f299bbc1959;hpb=f336ee034be3c9518883dfb34db27529f4a4b83b;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index 169dc5e2..2c90019c 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -147,17 +147,20 @@ _find_prefix (const char *name)
 {
     unsigned int i;
 
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++)
+    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++) {
 	if (strcmp (name, BOOLEAN_PREFIX_INTERNAL[i].name) == 0)
 	    return BOOLEAN_PREFIX_INTERNAL[i].prefix;
+    }
 
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++)
+    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) {
 	if (strcmp (name, BOOLEAN_PREFIX_EXTERNAL[i].name) == 0)
 	    return BOOLEAN_PREFIX_EXTERNAL[i].prefix;
+    }
 
-    for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++)
+    for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++) {
 	if (strcmp (name, PROBABILISTIC_PREFIX[i].name) == 0)
 	    return PROBABILISTIC_PREFIX[i].prefix;
+    }
 
     INTERNAL_ERROR ("No prefix exists for '%s'\n", name);
 
@@ -295,13 +298,14 @@ skip_space_and_comments (const char **str)
 	    int nesting = 1;
 	    s++;
 	    while (*s && nesting) {
-		if (*s == '(')
+		if (*s == '(') {
 		    nesting++;
-		else if (*s == ')')
+		} else if (*s == ')') {
 		    nesting--;
-		else if (*s == '\\')
+		} else if (*s == '\\') {
 		    if (*(s+1))
 			s++;
+		}
 		s++;
 	    }
 	}
@@ -518,7 +522,7 @@ notmuch_database_open (const char *path,
 		 error.get_msg().c_str());
 	notmuch = NULL;
     }
-    
+
   DONE:
     if (notmuch_path)
 	free (notmuch_path);
@@ -892,7 +896,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
     const char *date, *header;
     const char *from, *to, *subject;
-    char *message_id;
+    char *message_id = NULL;
 
     if (message_ret)
 	*message_ret = NULL;
@@ -937,11 +941,20 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	header = notmuch_message_file_get_header (message_file, "message-id");
 	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. */
 	    if (message_id == NULL)
 		message_id = talloc_strdup (message_file, header);
-	} else {
+
+	    /* Reject a Message ID that's too long. */
+	    if (message_id && strlen (message_id) + 1 > NOTMUCH_TERM_MAX) {
+		talloc_free (message_id);
+		message_id = NULL;
+	    }
+	}
+
+	if (message_id == NULL ) {
 	    /* No message-id at all, let's generate one by taking a
 	     * hash over the file's contents. */
 	    char *sha1 = notmuch_sha1_of_file (filename);