From 0a11aa405d3fbe970458d1cc154970e817826616 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 19 Jan 2020 09:42:37 +0200 Subject: [PATCH] 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 --- service/instance.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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; -- 2.25.1