diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-03-21 15:54:59 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-21 15:54:59 +0000 |
commit | 5a6f00b84669e8a095aee650c022a473a81f6069 (patch) | |
tree | 4ec8e0295a2861fe9c4f002dd4b30db7719a3a71 /package/network/services/ead/src/tinysrp/tphrase.c | |
parent | 7c029cc26290ee490fae85bbc413c3b0849927eb (diff) | |
download | upstream-5a6f00b84669e8a095aee650c022a473a81f6069.tar.gz upstream-5a6f00b84669e8a095aee650c022a473a81f6069.tar.bz2 upstream-5a6f00b84669e8a095aee650c022a473a81f6069.zip |
ead: clean up
Remove unused variables
Correct some (non important) memory leaks
Remove fclose(NULL)
Correct possible out of bound access
spotted with cppcheck
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
SVN-Revision: 39994
Diffstat (limited to 'package/network/services/ead/src/tinysrp/tphrase.c')
-rw-r--r-- | package/network/services/ead/src/tinysrp/tphrase.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/network/services/ead/src/tinysrp/tphrase.c b/package/network/services/ead/src/tinysrp/tphrase.c index 1aede0c832..0ab1e085c1 100644 --- a/package/network/services/ead/src/tinysrp/tphrase.c +++ b/package/network/services/ead/src/tinysrp/tphrase.c @@ -62,7 +62,6 @@ void doit(char *name) { char passphrase[128], passphrase1[128]; FILE *f; - struct t_conf *tc; struct t_confent *tcent; struct t_pw eps_passwd; @@ -152,7 +151,8 @@ t_changepw(pwname, diff) if((bakfp = fopen(bakfile2, "wb")) == NULL && (unlink(bakfile2) < 0 || (bakfp = fopen(bakfile2, "wb")) == NULL)) { fclose(passfp); - fclose(bakfp); + free(bakfile); + free(bakfile2); return -1; } @@ -169,10 +169,16 @@ t_changepw(pwname, diff) #ifdef USE_RENAME unlink(bakfile); - if(rename(pwname, bakfile) < 0) + if(rename(pwname, bakfile) < 0) { + free(bakfile); + free(bakfile2); return -1; - if(rename(bakfile2, pwname) < 0) + } + if(rename(bakfile2, pwname) < 0) { + free(bakfile); + free(bakfile2); return -1; + } #else unlink(bakfile); link(pwname, bakfile); |