From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 19 Jan 2020 07:42:37 +0000 (+0200)
Subject: instance: Fix instance_config_move_strdup() function
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a11aa405d3fbe970458d1cc154970e817826616;p=oweals%2Fprocd.git

instance: Fix instance_config_move_strdup() function

instance_config_move_strdup() previously returned too early in case of
a value being previously unassigned.

Fixes: 153820c ("instance: fix pidfile and seccomp attributes double free")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/service/instance.c b/service/instance.c
index ee25868..14da862 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -1021,11 +1021,10 @@ instance_config_cleanup(struct service_instance *in)
 static void
 instance_config_move_strdup(char **dst, char *src)
 {
-	if (!*dst)
-		return;
-
-	free(*dst);
-	*dst = NULL;
+	if (*dst) {
+		free(*dst);
+		*dst = NULL;
+	}
 
 	if (!src)
 		return;