IMAP memory issues with use of ConstStr

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

diff --git a/citadel/server/modules/imap/imap_search.c b/citadel/server/modules/imap/imap_search.c
index 72b57ba10e7c64b2ec3132bca57b9f44f5c217a8..03678d296db47ab9819d4b22036f1d407d01fa13 100644 (file)
--- a/citadel/server/modules/imap/imap_search.c
+++ b/citadel/server/modules/imap/imap_search.c
@@ -535,10 +535,10 @@ void imap_do_search(int num_items, ConstStr *itemlist, int is_uid) {
         * client software.  Revisit later...
         */
        for (i=0; i<num_items; ++i) {
-               if (itemlist[i].Key[0] == '(') {
+               if (itemlist[i].len && (itemlist[i].Key[0] == '(')) {
                        TokenCutLeft(&Imap->Cmd, &itemlist[i], 1);
                }
-               if (itemlist[i].Key[itemlist[i].len-1] == ')') {
+               if (itemlist[i].len && (itemlist[i].Key[itemlist[i].len-1] == ')')) {
                        TokenCutRight(&Imap->Cmd, &itemlist[i], 1);
                }
        }