From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Tue, 23 Jul 2019 12:05:02 +0000 (-0400)
Subject: global: Clean up MAX_INT_STRLEN usage
X-Git-Tag: 2.3.9~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8a708c04b8876ef597de19e711949cd3c1d088;p=thirdparty%2Fdovecot%2Fcore.git

global: Clean up MAX_INT_STRLEN usage

A number of MAX_INT_STRLEN consumers did not realize that it already
includes space for the trailing nul.
---

diff --git a/src/lib/file-lock.c b/src/lib/file-lock.c
index ab8a2d9b5e..a34ca5f066 100644
--- a/src/lib/file-lock.c
+++ b/src/lib/file-lock.c
@@ -97,7 +97,7 @@ file_lock_find_proc_locks(int lock_fd ATTR_UNUSED)
 #ifdef __linux__
 	static bool have_proc_locks = TRUE;
 	struct stat st;
-	char node_buf[MAX_INT_STRLEN*3 + 2 + 1];
+	char node_buf[MAX_INT_STRLEN * 3 + 2];
 	struct istream *input;
 	const char *line, *lock_type = "";
 	pid_t pid = 0;
diff --git a/src/lib/iostream-rawlog.c b/src/lib/iostream-rawlog.c
index fcde45d5c9..5805c9b30d 100644
--- a/src/lib/iostream-rawlog.c
+++ b/src/lib/iostream-rawlog.c
@@ -24,7 +24,7 @@
 static void
 rawlog_write_timestamp(struct rawlog_iostream *rstream, bool line_ends)
 {
-	unsigned char data[MAX_INT_STRLEN + 6 + 1 + 3];
+	unsigned char data[MAX_INT_STRLEN + 1 + 6 + 1 + 3];
 	buffer_t buf;
 
 	if ((rstream->flags & IOSTREAM_RAWLOG_FLAG_TIMESTAMP) == 0)
diff --git a/src/plugins/autocreate/autocreate-plugin.c b/src/plugins/autocreate/autocreate-plugin.c
index 8115761328..47c71ae6e8 100644
--- a/src/plugins/autocreate/autocreate-plugin.c
+++ b/src/plugins/autocreate/autocreate-plugin.c
@@ -74,7 +74,7 @@ read_autobox_settings(struct mail_user *user, const char *env_name_base,
 		      bool subscriptions)
 {
 	const char *value;
-	char env_name[13+MAX_INT_STRLEN+1];
+	char env_name[strlen(env_name_base) + MAX_INT_STRLEN];
 	unsigned int i = 1;
 
 	value = mail_user_plugin_getenv(user, env_name_base);
diff --git a/src/plugins/expire/doveadm-expire.c b/src/plugins/expire/doveadm-expire.c
index b6aab1a6fa..492f305823 100644
--- a/src/plugins/expire/doveadm-expire.c
+++ b/src/plugins/expire/doveadm-expire.c
@@ -171,7 +171,7 @@ static const char *const *doveadm_expire_get_patterns(void)
 {
 	ARRAY_TYPE(const_string) patterns;
 	const char *str;
-	char set_name[6+MAX_INT_STRLEN+1];
+	char set_name[6 + MAX_INT_STRLEN];
 	unsigned int i;
 
 	t_array_init(&patterns, 16);
diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index 89bbddd28c..6dd713b829 100644
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -382,7 +382,7 @@ static const char *const *expire_get_patterns(struct mail_user *user)
 {
 	ARRAY_TYPE(const_string) patterns;
 	const char *str;
-	char set_name[6+MAX_INT_STRLEN+1];
+	char set_name[6 + MAX_INT_STRLEN];
 	unsigned int i;
 
 	t_array_init(&patterns, 16);
diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 2cecce864f..a4984c69a9 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -802,7 +802,7 @@ static const char *const *fts_exclude_get_patterns(struct mail_user *user)
 {
 	ARRAY_TYPE(const_string) patterns;
 	const char *str;
-	char set_name[21+MAX_INT_STRLEN+1];
+	char set_name[21 + MAX_INT_STRLEN];
 	unsigned int i;
 
 	str = mail_user_plugin_getenv(user, "fts_autoindex_exclude");
diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index 1276500d92..015bab841e 100644
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -724,7 +724,7 @@ maildirquota_refresh(struct maildir_quota_root *root, bool *recalculated_r,
 static int maildirsize_update(struct maildir_quota_root *root,
 			      int count_diff, int64_t bytes_diff)
 {
-	char str[MAX_INT_STRLEN*2 + 2 + 1];
+	char str[MAX_INT_STRLEN * 2 + 2];
 	int ret = 0;
 
 	if (count_diff == 0 && bytes_diff == 0)
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 2bd54cebcd..cc3ea562b9 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -302,7 +302,7 @@ int quota_user_read_settings(struct mail_user *user,
 			     const char **error_r)
 {
 	struct quota_settings *quota_set;
-	char root_name[5 + MAX_INT_STRLEN + 1];
+	char root_name[5 + MAX_INT_STRLEN];
 	const char *env, *error;
 	unsigned int i;
 	pool_t pool;