Fix two small memory leaks.

[oweals/tinc.git] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index b4c79139f81534c6a9421ef6d551e67f4f8c6150..ab181945da15ade67dbf4cc9ae0ba4bfc751e9dc 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -387,7 +387,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 
 bool net2str(char *netstr, int len, const subnet_t *subnet) {
        if(!netstr || !subnet) {
 
 bool net2str(char *netstr, int len, const subnet_t *subnet) {
        if(!netstr || !subnet) {

-               logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
+               logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", (void *)netstr, (void *)subnet);

                return false;
        }
 
                return false;
        }
 


@@ -592,9 +592,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 
        // Prepare environment variables to be passed to the script
 
 
        // Prepare environment variables to be passed to the script
 

-       xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-       xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+       xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+       xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+       xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");

        xasprintf(&envp[3], "NODE=%s", owner->name);
        xasprintf(&envp[4], "NAME=%s", myself->name);
 
        xasprintf(&envp[3], "NODE=%s", owner->name);
        xasprintf(&envp[4], "NAME=%s", myself->name);
 


@@ -659,7 +659,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                }
        }
 
                }
        }
 

-       for(i = 0; envp[i] && i < 9; i++) {
+       for(i = 0; i < 9; i++) {

                free(envp[i]);
        }
 }
                free(envp[i]);
        }
 }