X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fmessage.cc;h=dc4a96ada6380c81cd129237870efa5d403422aa;hb=9300defd64acf68b8e6fa6fbd89b8050168bb63d;hp=4d1b08d6f7006885d4894cca03599f6eecaf1032;hpb=97939170b3e8b31f88520932aa20bf1b98e469c3;p=notmuch

diff --git a/lib/message.cc b/lib/message.cc
index 4d1b08d6..dc4a96ad 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1446,8 +1446,12 @@ _notmuch_message_gen_terms (notmuch_message_t *message,
     term_gen->set_termpos (message->termpos);
 
     if (prefix_name) {
+	const char *prefix = _notmuch_database_prefix (message->notmuch, prefix_name);
+	if (prefix == NULL)
+	    return NOTMUCH_PRIVATE_STATUS_BAD_PREFIX;
+
 	_notmuch_message_invalidate_metadata (message, prefix_name);
-	term_gen->index_text (text, 1, _find_prefix (prefix_name));
+	term_gen->index_text (text, 1, prefix);
     } else {
 	term_gen->index_text (text);
     }