From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 1 Sep 2020 06:57:04 +0000 (+0300)
Subject: lib-index: Use SIZE_MAX with str_sanitize
X-Git-Tag: 2.3.13~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa3b53798c88133e52e01567dc5cd902fb2a0c88;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Use SIZE_MAX with str_sanitize
---

diff --git a/src/lib-index/mail-index-map.c b/src/lib-index/mail-index-map.c
index ae0f4ee24b..a8faaa02e0 100644
--- a/src/lib-index/mail-index-map.c
+++ b/src/lib-index/mail-index-map.c
@@ -132,7 +132,7 @@ int mail_index_map_ext_get_next(struct mail_index_map *map,
 
 	*name_r = t_strndup(CONST_PTR_OFFSET(map->hdr_base, name_offset),
 			    ext_hdr->name_size);
-	if (strcmp(*name_r, str_sanitize(*name_r, -1)) != 0) {
+	if (strcmp(*name_r, str_sanitize(*name_r, SIZE_MAX)) != 0) {
 		/* we allow only plain ASCII names, so this extension
 		   is most likely broken */
 		*name_r = "";
diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 6b54979e07..0ef4bebd79 100644
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -254,7 +254,7 @@ uint32_t mail_index_ext_register(struct mail_index *index, const char *name,
 	struct mail_index_registered_ext rext;
 	uint32_t ext_id;
 
-	if (*name == '\0' || strcmp(name, str_sanitize(name, -1)) != 0)
+	if (*name == '\0' || strcmp(name, str_sanitize(name, SIZE_MAX)) != 0)
 		i_panic("mail_index_ext_register(%s): Invalid name", name);
 
 	if (default_record_size != 0 && default_record_align == 0) {