Calls to cdb_fetch()/cdb_next_item() now check ptr for NULL or non-NULL

[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 b7a497801e1974831df795dafc01ee17954b04df..99d80cbba1731744fe9368e5912735241d6232ee 100644 (file)
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -128,7 +128,7 @@ void ft_index_message(long msgnum, int op) {
                                // fetch the bucket, Liza
                                if (ftc_msgs[tok] == NULL) {
                                        cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tok, sizeof(int));
-                                       if (cdb_bucket.len > 0) {
+                                       if (cdb_bucket.ptr != NULL) {
                                                ftc_num_msgs[tok] = cdb_bucket.len / sizeof(long);
                                                ftc_msgs[tok] = malloc(cdb_bucket.len);
                                                memcpy(ftc_msgs[tok], cdb_bucket.ptr, cdb_bucket.len);
@@ -310,7 +310,7 @@ void ft_search(int *fts_num_msgs, long **fts_msgs, const char *search_string) {
                        // fetch the bucket, Liza
                        if (ftc_msgs[tok] == NULL) {
                                cdb_bucket = cdb_fetch(CDB_FULLTEXT, &tok, sizeof(int));
-                               if (cdb_bucket.len > 0) {
+                               if (cdb_bucket.ptr != NULL) {
                                        ftc_num_msgs[tok] = cdb_bucket.len / sizeof(long);
                                        ftc_msgs[tok] = (long *) malloc(cdb_bucket.len);
                                        memcpy(ftc_msgs[tok], cdb_bucket.ptr, cdb_bucket.len);