From 1fd05847bd937aa3cb5b9c01720392160eabb45e Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 6 Oct 2024 20:10:29 +0200
Subject: [PATCH] Rely on str_free(NULL) to be a no-op

---
 src/managesieve/cmd-setactive.c                | 3 +--
 src/plugins/doveadm-sieve/doveadm-sieve-sync.c | 3 +--
 src/plugins/imapsieve/imap-sieve-storage.c     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/managesieve/cmd-setactive.c b/src/managesieve/cmd-setactive.c
index b1a86c0af..8c3b44b71 100644
--- a/src/managesieve/cmd-setactive.c
+++ b/src/managesieve/cmd-setactive.c
@@ -119,8 +119,7 @@ cmd_setactive_activate(struct client_command_context *cmd,
 		client_send_no(client, errormsg);
 	}
 
-	if (errors != NULL)
-		str_free(&errors);
+	str_free(&errors);
 	sieve_script_unref(&script);
 }
 
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
index 6ce35cbdb..8c77d876a 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
@@ -732,8 +732,7 @@ static int sieve_attribute_iter_deinit(struct mailbox_attribute_iter *iter)
 	}
 	if (siter->sieve_list != NULL)
 		(void)sieve_storage_list_deinit(&siter->sieve_list);
-	if (siter->name != NULL)
-		str_free(&siter->name);
+	str_free(&siter->name);
 	i_free(siter);
 	return ret;
 }
diff --git a/src/plugins/imapsieve/imap-sieve-storage.c b/src/plugins/imapsieve/imap-sieve-storage.c
index 2f03e73c2..538fed2f8 100644
--- a/src/plugins/imapsieve/imap-sieve-storage.c
+++ b/src/plugins/imapsieve/imap-sieve-storage.c
@@ -357,8 +357,7 @@ static void imap_sieve_mail_free(struct mail *_mail)
 
 	ismail->module_ctx.super.free(_mail);
 
-	if (flags != NULL)
-		str_free(&flags);
+	str_free(&flags);
 }
 
 static void imap_sieve_mail_allocated(struct mail *_mail)
-- 
GitLab