From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 6 Apr 2005 20:43:37 +0000 (+0000)
Subject: Remove unused (and potentially segfaulting) net2str() call.
X-Git-Tag: release-1.0.4~6
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=92c4a28d7d43b68a324cf2eca741298ed6b692d6

Remove unused (and potentially segfaulting) net2str() call.
---

diff --git a/src/subnet.c b/src/subnet.c
index b52dfa53..3652cd3a 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -247,6 +247,11 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 {
 	cp();
 
+	if(!netstr || !subnet) {
+		logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
+		return false;
+	}
+
 	switch (subnet->type) {
 		case SUBNET_MAC:
 			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
@@ -424,9 +429,6 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 			execute_script(name, envp);
 	}
 
-	net2str(netstr, sizeof netstr, subnet);
-	envp[6] = envp[7] = NULL;
-
 	for(i = 0; i < (owner != myself ? 6 : 4); i++)
 		free(envp[i]);