X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=d1e1e61d07cdf6ad830db6fb7f17fcf334d86ae1;hb=cfc9fee931c70554353ce6c4acc3407baac08745;hp=e71a4889a3f177a14826db0aaf5dfd4082f2b79d;hpb=08f1e0cd33812f9d972dd7c59021443a8d02d0e0;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index e71a4889..d1e1e61d 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -457,11 +457,13 @@ int cmd_invite(int argc, char *argv[]) {
 	randomize(cookie, 18);
 
 	// Create a filename that doesn't reveal the cookie itself
-	uint8_t buf[18 + strlen(fingerprint)];
+	const size_t buflen = 18 + strlen(fingerprint);
+	uint8_t *buf = alloca(buflen);
+
 	char cookiehash[64];
 	memcpy(buf, cookie, 18);
-	memcpy(buf + 18, fingerprint, sizeof(buf) - 18);
-	sha512(buf, sizeof(buf), cookiehash);
+	memcpy(buf + 18, fingerprint, buflen - 18);
+	sha512(buf, buflen, cookiehash);
 	b64encode_tinc_urlsafe(cookiehash, cookiehash, 18);
 
 	free(fingerprint);
@@ -551,7 +553,7 @@ static char *data;
 static size_t datalen;
 static bool success = false;
 
-static char *get_line(const char **data) {
+static char *get_line(char *line, size_t linelen, const char **data) {
 	if(!data || !*data) {
 		return NULL;
 	}
@@ -561,11 +563,10 @@ static char *get_line(const char **data) {
 		return NULL;
 	}
 
-	static char line[1024];
 	const char *end = strchr(*data, '\n');
 	size_t len = end ? (size_t)(end - *data) : strlen(*data);
 
-	if(len >= sizeof(line)) {
+	if(len >= linelen) {
 		fprintf(stderr, "Maximum line length exceeded!\n");
 		return NULL;
 	}
@@ -587,7 +588,9 @@ static char *get_line(const char **data) {
 }
 
 static char *get_value(const char *data, const char *var) {
-	char *line = get_line(&data);
+	static char buf[1024];
+
+	char *line = get_line(buf, sizeof(buf), &data);
 
 	if(!line) {
 		return NULL;
@@ -654,18 +657,13 @@ static char *grep(const char *data, const char *var) {
 }
 
 static bool finalize_join(void) {
-	const char *temp_name = get_value(data, "Name");
+	const char *name = get_value(data, "Name");
 
-	if(!temp_name) {
+	if(!name) {
 		fprintf(stderr, "No Name found in invitation!\n");
 		return false;
 	}
 
-	size_t len = strlen(temp_name);
-	char name[len + 1];
-	memcpy(name, temp_name, len);
-	name[len] = 0;
-
 	if(!check_id(name)) {
 		fprintf(stderr, "Invalid Name found in invitation!\n");
 		return false;
@@ -772,7 +770,9 @@ make_names:
 	const char *p = data;
 	char *l, *value;
 
-	while((l = get_line(&p))) {
+	static char line[1024];
+
+	while((l = get_line(line, sizeof(line), &p))) {
 		// Ignore comments
 		if(*l == '#') {
 			continue;
@@ -879,7 +879,7 @@ make_names:
 			return false;
 		}
 
-		while((l = get_line(&p))) {
+		while((l = get_line(line, sizeof(line), &p))) {
 			if(!strcmp(l, "#---------------------------------------------------------------#")) {
 				continue;
 			}