Don't check for NULL-pointers before calling free().

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index 81dae5f..dc30b01 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -627,13 +627,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                        }
 
                        // Prepare the SUBNET and WEIGHT variables
-                       if(envp[5]) {
-                               free(envp[5]);
-                       }
-
-                       if(envp[6]) {
-                               free(envp[6]);
-                       }
+                       free(envp[5]);
+                       free(envp[6]);
 
                        xasprintf(&envp[5], "SUBNET=%s", netstr);
                        xasprintf(&envp[6], "WEIGHT=%s", weight);
@@ -659,7 +654,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]);
        }
 }