From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Fri, 16 Feb 2018 14:59:35 +0000 (+0200)
Subject: charset-alias: Fix keyvalues iteration
X-Git-Tag: 2.2.35~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bf8a6749d1664fe43bd7c39b6d4cd3049e01cfb;p=thirdparty%2Fdovecot%2Fcore.git

charset-alias: Fix keyvalues iteration

charset-alias-plugin.c:113:27: error: comparison between pointer and zero
character constant [-Werror=pointer-compare]
  for (i = 0; keyvalues[i] != '\0'; i++) {
                           ^~
charset-alias-plugin.c:113:14: note: did you mean to dereference the pointer?
  for (i = 0; keyvalues[i] != '\0'; i++) {
---

diff --git a/src/plugins/charset-alias/charset-alias-plugin.c b/src/plugins/charset-alias/charset-alias-plugin.c
index 9ef1b572e0..c7dbe0a68c 100644
--- a/src/plugins/charset-alias/charset-alias-plugin.c
+++ b/src/plugins/charset-alias/charset-alias-plugin.c
@@ -110,7 +110,7 @@ static unsigned int charset_aliases_init(struct mail_user *user, pool_t pool, co
 
 	p_array_init(&charset_aliases, pool, 1);
 	keyvalues = t_strsplit_spaces(str, " ");
-	for (i = 0; keyvalues[i] != '\0'; i++) {
+	for (i = 0; keyvalues[i] != NULL; i++) {
 		value = strchr(keyvalues[i], '=');
 		if (value == NULL) {
 			i_error("charset_alias: Missing '=' in charset_aliases setting");