From c97013b87bf23d3684aa8a796e00305452af8beb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 21 Mar 2014 15:54:59 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39994 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/ead/src/tinysrp/tphrase.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'package/network/services/ead/src/tinysrp/tphrase.c') 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); -- cgit v1.2.3