From: Roy Marples <roy@marples.name>
Date: Mon, 15 Feb 2016 16:37:13 +0000 (+0000)
Subject: Ensure that env is freed in arraytostr() fails. Fixes [8d24cd2f25].
X-Git-Tag: v6.10.2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e14ceb452a178e6e9b64c55dc30e9e6edfa2111e;p=thirdparty%2Fdhcpcd.git

Ensure that env is freed in arraytostr() fails. Fixes [8d24cd2f25].
---

diff --git a/script.c b/script.c
index 4fab7916..7fb3db6e 100644
--- a/script.c
+++ b/script.c
@@ -596,9 +596,9 @@ send_interface1(struct fd_list *fd, const struct interface *iface,
 	elen = (size_t)arraytostr((const char *const *)env, &s);
 	if ((ssize_t)elen == -1) {
 		free(s);
-		return -1;
-	}
-	retval = control_queue(fd, s, elen, 1);
+		retval = -1;
+	} else
+		retval = control_queue(fd, s, elen, 1);
 	ep = env;
 	while (*ep)
 		free(*ep++);