Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 5b501e4e7aba575f2018fef4b04715115a1e0306..f4d501c9d3853dd56c8895e804ac0c5d943755ea 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -306,7 +306,7 @@ void imap_append(int num_parms, ConstStr *Params) {
                return;
        }
 
                return;
        }
 

-       strcpy(new_message_flags, "");
+       *new_message_flags = '\0';

        if (num_parms >= 5) {
                for (i=3; i<num_parms; ++i) {
                        strcat(new_message_flags, Params[i].Key);
        if (num_parms >= 5) {
                for (i=3; i<num_parms; ++i) {
                        strcat(new_message_flags, Params[i].Key);


@@ -430,7 +430,7 @@ void imap_append(int num_parms, ConstStr *Params) {
        /* We don't need this buffer anymore */
        CM_Free(msg);
 
        /* We don't need this buffer anymore */
        CM_Free(msg);
 

-       if (new_message_flags != NULL) {
+       if (IsEmptyStr(new_message_flags)) {

                imap_do_append_flags(new_msgnum, new_message_flags);
        }
 }
                imap_do_append_flags(new_msgnum, new_message_flags);
        }
 }