d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory / resource leaks in usr.sbin/rpc.ypupdated/update.c

Browse Source 
Re-apply r343909 to this file to get the issue fixed.

PR:		204956
Reported by:	David Binderman <dcb314@hotmail.com>
MFC after:	5 days
This commit is contained in:
Andriy Voskoboinyk 2019-02-18 03:15:25 +00:00
parent d61897abea
commit 994558c335
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/rpc.ypupdated/update.c
View File

@ -263,11 +263,14 @@ localupdate(char *name, char *filename, u_int op, u_int keylen __unused,
sprintf(tmpname, "%s.tmp", filename); sprintf(tmpname, "%s.tmp", filename);
rf = fopen(filename, "r"); rf = fopen(filename, "r");
if (rf == NULL) { if (rf == NULL) {
return (ERR_READ); err = ERR_READ;
goto cleanup;
} }
wf = fopen(tmpname, "w"); wf = fopen(tmpname, "w");
if (wf == NULL) { if (wf == NULL) {
return (ERR_WRITE); fclose(rf);
err = ERR_WRITE;
goto cleanup;
} }
err = -1; err = -1;
while (fgets(line, sizeof (line), rf)) { while (fgets(line, sizeof (line), rf)) {
@ -307,13 +310,17 @@ localupdate(char *name, char *filename, u_int op, u_int keylen __unused,
fclose(rf); fclose(rf);
if (err == 0) { if (err == 0) {
if (rename(tmpname, filename) < 0) { if (rename(tmpname, filename) < 0) {
return (ERR_DBASE); err = ERR_DBASE;
goto cleanup;
} }
} else { } else {
if (unlink(tmpname) < 0) { if (unlink(tmpname) < 0) {
return (ERR_DBASE); err = ERR_DBASE;
goto cleanup;
} }
} }
cleanup:
free(tmpname);
return (err); return (err);
} }