* migrate redirect_buffer logic to StrBuf, valgrind reported some related errors.

[citadel.git] / citadel / modules / imap / imap_search.c

diff --git a/citadel/modules/imap/imap_search.c b/citadel/modules/imap/imap_search.c
index 9fe72051355b526dbaa665e32af5228631ee1a17..4972e98e74216341e90a516ff30e70db99edc5e2 100644 (file)
--- a/citadel/modules/imap/imap_search.c
+++ b/citadel/modules/imap/imap_search.c
@@ -256,12 +256,10 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
 
                if (msg != NULL) {
        
-                       CC->redirect_buffer = malloc(SIZ);
-                       CC->redirect_len = 0;
-                       CC->redirect_alloc = SIZ;
+                       CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
                        CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_FAST, 0, 1, 0);
        
-                       fieldptr = rfc822_fetch_field(CC->redirect_buffer, itemlist[pos+1].Key);
+                       fieldptr = rfc822_fetch_field(ChrPtr(CC->redirect_buffer), itemlist[pos+1].Key);
                        if (fieldptr != NULL) {
                                if (bmstrcasestr(fieldptr, itemlist[pos+2].Key)) {
                                        match = 1;
@@ -269,10 +267,7 @@ int imap_do_search_msg(int seq, struct CtdlMessage *supplied_msg,
                                free(fieldptr);
                        }
        
-                       free(CC->redirect_buffer);
-                       CC->redirect_buffer = NULL;
-                       CC->redirect_len = 0;
-                       CC->redirect_alloc = 0;
+                       FreeStrBuf(&CC->redirect_buffer);
                }
 
                pos += 3;       /* Yes, three */