X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=b2e35f98b9ec0320435869efcd588ba4529bd515;hb=7ab400aebdc38e7ee5dafc0a2291bbbea25e3f7c;hp=2f28aef492c29eb3e0d126785f15d72e2c9807d0;hpb=210aaecc8bf2cf300921a99e1e7bd9bd61cf8ecf;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 2f28aef4..b2e35f98 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -111,6 +111,9 @@ char *get_my_hostname() {
 		scan_for_hostname(tinc_conf, &hostname, &port);
 	}
 
+	free(name);
+	name = NULL;
+
 	if(hostname) {
 		goto done;
 	}
@@ -289,6 +292,7 @@ int cmd_invite(int argc, char *argv[]) {
 		return 1;
 	}
 
+	free(myname);
 	myname = get_my_name(true);
 
 	if(!myname) {
@@ -407,6 +411,7 @@ int cmd_invite(int argc, char *argv[]) {
 
 		if(!f) {
 			fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
+			free(key);
 			return 1;
 		}
 
@@ -415,6 +420,7 @@ int cmd_invite(int argc, char *argv[]) {
 		if(!ecdsa_write_pem_private_key(key, f)) {
 			fprintf(stderr, "Could not write ECDSA private key\n");
 			fclose(f);
+			free(key);
 			return 1;
 		}
 
@@ -444,6 +450,8 @@ int cmd_invite(int argc, char *argv[]) {
 	sha512(fingerprint, strlen(fingerprint), hash);
 	b64encode_urlsafe(hash, hash, 18);
 
+	free(key);
+
 	// Create a random cookie for this invitation.
 	char cookie[25];
 	randomize(cookie, 18);
@@ -456,6 +464,8 @@ int cmd_invite(int argc, char *argv[]) {
 	sha512(buf, sizeof(buf), cookiehash);
 	b64encode_urlsafe(cookiehash, cookiehash, 18);
 
+	free(fingerprint);
+
 	b64encode_urlsafe(cookie, cookie, 18);
 
 	// Create a file containing the details of the invitation.
@@ -1237,6 +1247,7 @@ int cmd_join(int argc, char *argv[]) {
 	struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
 
 	if(!ai) {
+		free(b64key);
 		return 1;
 	}
 
@@ -1250,6 +1261,7 @@ next:
 
 		if(!aip) {
 			freeaddrinfo(ai);
+			free(b64key);
 			return 1;
 		}
 	}
@@ -1296,6 +1308,11 @@ next:
 	}
 
 	freeaddrinfo(ai);
+	ai = NULL;
+	aip = NULL;
+
+	free(b64key);
+	b64key = NULL;
 
 	// Check if the hash of the key he gave us matches the hash in the URL.
 	char *fingerprint = line + 2;