Additional checks to keep zero-length messages from crashing the indexer.

[citadel.git] / citadel / server / modules / fulltext / serv_fulltext.c

diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c
index 959e32637e6d14faa4d2b56b9738036dc160650a..77ca552bd09faf0dc8e50bd4c33e5329d6925863 100644 (file)
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -94,16 +94,17 @@ void ft_index_message(long msgnum, int op) {
        tokens_in_this_message = wordbreaker(txt);
        free(txt);
 
+       if (tokens_in_this_message == NULL) {
+               syslog(LOG_DEBUG, "fulltext: skipping empty index for message %ld", msgnum);
+               return;
+       }
+
        syslog(LOG_DEBUG, "fulltext: %sindexing message %ld [%d tokens]",
                (op ? "" : "de"),
                msgnum,
                array_len(tokens_in_this_message)
        );
 
-       if (tokens_in_this_message == NULL) {
-               return;
-       }
-
        if (array_len(tokens_in_this_message) > 0) {
                begin_critical_section(S_INDEXER);
                cdb_begin_transaction();