projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b63280f
)
Fix a few minor memory leaks.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 6 Oct 2017 19:40:03 +0000
(21:40 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 6 Oct 2017 19:40:03 +0000
(21:40 +0200)
src/tincd.c
patch
|
blob
|
history
diff --git
a/src/tincd.c
b/src/tincd.c
index
84ce0d4
..
98a9a64
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-413,6
+413,7
@@
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");
@@
-420,8
+421,10
@@
static bool keygen(int bits) {
snprintf(filename, sizeof filename, "%s/rsa_key.priv", confbase);
f = ask_and_open(filename, "private RSA key");
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. */
@@
-443,13
+446,17
@@
static bool keygen(int bits) {
f = ask_and_open(filename, "public RSA key");
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;
}
@@
-737,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;