From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 24 Sep 2021 13:36:41 +0000 (+0300)
Subject: lib-index: Add more mail_index_ext_name_is_valid() asserts
X-Git-Tag: 2.3.18~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6baff5b2d430cee1ae0b0337a2be48ef44be161c;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Add more mail_index_ext_name_is_valid() asserts
---

diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c
index 32d6c47cf4..6ac2b93fc6 100644
--- a/src/lib-index/mail-index-map.c
+++ b/src/lib-index/mail-index-map.c
@@ -71,6 +71,8 @@ mail_index_map_register_ext(struct mail_index_map *map,
 	struct mail_index_ext *ext;
 	uint32_t idx, ext_map_idx, empty_idx = (uint32_t)-1;
 
+	i_assert(mail_index_ext_name_is_valid(name));
+
 	if (!array_is_created(&map->extensions)) {
                 mail_index_map_init_extbufs(map, 5);
 		idx = 0;
diff --git a/src/lib-index/mail-index-sync-ext.c b/src/lib-index/mail-index-sync-ext.c
index 975977117e..1873f3326d 100644
--- a/src/lib-index/mail-index-sync-ext.c
+++ b/src/lib-index/mail-index-sync-ext.c
@@ -364,6 +364,8 @@ mail_index_sync_ext_init_new(struct mail_index_sync_map_ctx *ctx,
 	buffer_t *hdr_buf;
 	uint32_t ext_map_idx;
 
+	i_assert(mail_index_ext_name_is_valid(name));
+
 	/* be sure to get a unique mapping before we modify the extensions,
 	   otherwise other map users will see the new extension but not the
 	   data records that sync_ext_reorder() adds. */