From: Timo Sirainen <tss@iki.fi>
Date: Thu, 4 Apr 2013 20:03:06 +0000 (+0300)
Subject: imapc: Give an early error message if imapc_list_prefix ends with separator.
X-Git-Tag: 2.2.rc4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6eeb3fd0f42be578ea846fd13398df23505fe3b7;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Give an early error message if imapc_list_prefix ends with separator.
---

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 8a1619273b..bfcb1ad1cb 100644
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -186,6 +186,7 @@ imapc_storage_get_hierarchy_sep(struct imapc_storage *storage,
 {
 	struct imapc_command *cmd;
 	struct imapc_simple_context sctx;
+	const char *imapc_list_prefix = storage->set->imapc_list_prefix;
 
 	imapc_simple_context_init(&sctx, storage);
 	cmd = imapc_client_cmd(storage->client, imapc_simple_callback, &sctx);
@@ -202,6 +203,12 @@ imapc_storage_get_hierarchy_sep(struct imapc_storage *storage,
 		*error_r = "LIST didn't return hierarchy separator";
 		return -1;
 	}
+
+	if (imapc_list_prefix[0] != '\0' &&
+	    imapc_list_prefix[strlen(imapc_list_prefix)-1] == storage->list->sep) {
+		*error_r = "imapc_list_prefix must not end with hierarchy separator";
+		return -1;
+	}
 	return sctx.ret;
 }