Browse Source

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

Guus Sliepen 5 years ago
parent
commit
26203e2504
4 changed files with 11 additions and 42 deletions
  1. 3 12
      src/conf.c
  2. 2 7
      src/subnet.c
  3. 5 19
      src/tincd.c
  4. 1 4
      src/uml_device.c

+ 3 - 12
src/conf.c

@@ -81,18 +81,9 @@ config_t *new_config(void) {
 }
 
 void free_config(config_t *cfg) {
-	if(cfg->variable) {
-		free(cfg->variable);
-	}
-
-	if(cfg->value) {
-		free(cfg->value);
-	}
-
-	if(cfg->file) {
-		free(cfg->file);
-	}
-
+	free(cfg->variable);
+	free(cfg->value);
+	free(cfg->file);
 	free(cfg);
 }
 

+ 2 - 7
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);

+ 5 - 19
src/tincd.c

@@ -562,25 +562,11 @@ static void make_names(void) {
 }
 
 static void free_names() {
-	if(identname) {
-		free(identname);
-	}
-
-	if(netname) {
-		free(netname);
-	}
-
-	if(pidfilename) {
-		free(pidfilename);
-	}
-
-	if(logfilename) {
-		free(logfilename);
-	}
-
-	if(confbase) {
-		free(confbase);
-	}
+	free(identname);
+	free(netname);
+	free(pidfilename);
+	free(logfilename);
+	free(confbase);
 }
 
 static bool drop_privs() {

+ 1 - 4
src/uml_device.c

@@ -181,10 +181,7 @@ void close_device(void) {
 	unlink(device);
 
 	free(device);
-
-	if(iface) {
-		free(iface);
-	}
+	free(iface);
 }
 
 static bool read_packet(vpn_packet_t *packet) {