projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few minor memory leaks.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
22fb726
..
98a9a64
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-390,7
+390,7
@@
static bool keygen(int bits) {
BIGNUM *e = NULL;
RSA *rsa_key;
FILE *f;
BIGNUM *e = NULL;
RSA *rsa_key;
FILE *f;
- char
*pubname, *privname
;
+ char
filename[PATH_MAX]
;
BN_GENCB *cb;
int result;
BN_GENCB *cb;
int result;
@@
-413,16
+413,18
@@
static bool keygen(int bits) {
if(!result) {
fprintf(stderr, "Error during key generation!\n");
if(!result) {
fprintf(stderr, "Error during key generation!\n");
+ RSA_free(rsa_key);
return false;
} else
fprintf(stderr, "Done.\n");
return false;
} else
fprintf(stderr, "Done.\n");
- xasprintf(&privname, "%s/rsa_key.priv", confbase);
- f = ask_and_open(privname, "private RSA key");
- free(privname);
+ snprintf(filename, sizeof filename, "%s/rsa_key.priv", confbase);
+ f = ask_and_open(filename, "private RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
return false;
+ }
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
@@
-436,22
+438,25
@@
static bool keygen(int bits) {
char *name = get_name();
if(name) {
char *name = get_name();
if(name) {
-
xasprintf(&pub
name, "%s/hosts/%s", confbase, name);
+
snprintf(filename, sizeof file
name, "%s/hosts/%s", confbase, name);
free(name);
} else {
free(name);
} else {
-
xasprintf(&pub
name, "%s/rsa_key.pub", confbase);
+
snprintf(filename, sizeof file
name, "%s/rsa_key.pub", confbase);
}
}
- f = ask_and_open(pubname, "public RSA key");
- free(pubname);
+ f = ask_and_open(filename, "public RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
return false;
+ }
fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
+ RSA_free(rsa_key);
+
return true;
}
return true;
}
@@
-739,7
+744,7
@@
end:
ERR_free_strings();
exit_configuration(&config_tree);
ERR_free_strings();
exit_configuration(&config_tree);
- list_
free
(cmdline_conf);
+ list_
delete_list
(cmdline_conf);
free_names();
return status;
free_names();
return status;