X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=a33bdfea3b0b0624ef5681e79924582e20568b2b;hb=9250f2dc194a762e7484362c52b3abf76cae4ce2;hp=5304ab5ea3085f1f860ff4cacbd8bf845ec49156;hpb=6123ed30992d671b94fc016660086be6a62a3871;p=tinc

diff --git a/src/conf.c b/src/conf.c
index 5304ab5e..a33bdfea 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -80,18 +80,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);
 }
 
@@ -203,7 +194,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 }
 
 bool get_config_subnet(const config_t *cfg, subnet_t **result) {
-	subnet_t subnet = {NULL};
+	subnet_t subnet = {0};
 
 	if(!cfg) {
 		return false;
@@ -433,7 +424,11 @@ bool read_server_config(void) {
 
 				// And we try to read the ones that end with ".conf"
 				if(l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
-					snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ep->d_name);
+					if((size_t)snprintf(fname, sizeof(fname), "%s" SLASH "%s", dname, ep->d_name) >= sizeof(fname)) {
+						logger(DEBUG_ALWAYS, LOG_ERR, "Pathname too long: %s/%s", dname, ep->d_name);
+						return false;
+					}
+
 					x = read_config_file(config_tree, fname, true);
 				}
 			}