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 | c97013b87bf23d3684aa8a796e00305452af8beb (patch) | |
| tree | fc92fd4e7ae934b1c85b6fbf78b59d2b93257505 /package/network/services/ead/src/tinysrp/tphrase.c | |
| parent | dd4175bcc12c2f2d089f5dfd5724b4c30c49de3b (diff) | |
| download | master-187ad058-c97013b87bf23d3684aa8a796e00305452af8beb.tar.gz master-187ad058-c97013b87bf23d3684aa8a796e00305452af8beb.tar.bz2 master-187ad058-c97013b87bf23d3684aa8a796e00305452af8beb.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39994 3c298f89-4303-0410-b956-a3cf2f4a3e73
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); |