lib-storage: Make sure POP3 UIDLs aren't tried to be saved with LFs.

diff --git a/src/lib-storage/index/dbox-common/dbox-save.c b/src/lib-storage/index/dbox-common/dbox-save.c
index c5fee812ab3b8f60aa433c340f1eeb1c3e6aba18..52d7d08a6c795f84918f2482ec35a300c5d9c358 100644 (file)
--- a/src/lib-storage/index/dbox-common/dbox-save.c
+++ b/src/lib-storage/index/dbox-common/dbox-save.c
@@ -147,6 +147,7 @@ void dbox_save_write_metadata(struct mail_save_context *_ctx,
        str_printfa(str, "%c%llx\n", DBOX_METADATA_VIRTUAL_SIZE,
                    (unsigned long long)vsize);
        if (_ctx->pop3_uidl != NULL) {
+               i_assert(strchr(_ctx->pop3_uidl, '\n') == NULL);
                str_printfa(str, "%c%s\n", DBOX_METADATA_POP3_UIDL,
                            _ctx->pop3_uidl);
        }

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 4c18c438adc2df743fe6ea1835c118942b636d62..a82a1e06064d3bf8d48317d65db2ebcb1d540cea 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1357,6 +1357,7 @@ void mailbox_save_set_guid(struct mail_save_context *ctx, const char *guid)
 void mailbox_save_set_pop3_uidl(struct mail_save_context *ctx, const char *uidl)
 {
        i_assert(*uidl != '\0');
+       i_assert(strchr(uidl, '\n') == NULL);
 
        i_free(ctx->pop3_uidl);
        ctx->pop3_uidl = i_strdup(uidl);