svn commit: r344244 - head/usr.sbin/rpc.ypupdated

[Andriy Voskoboinyk]

Author: avos
Date: Mon Feb 18 03:15:25 2019
New Revision: 344244
URL: https://svnweb.freebsd.org/changeset/base/344244

Log:
  Fix memory / resource leaks in usr.sbin/rpc.ypupdated/update.c
  
  Re-apply r343909 to this file to get the issue fixed.
  
  PR:		204956
  Reported by:	David Binderman <dcb314 at hotmail.com>
  MFC after:	5 days

Modified:
  head/usr.sbin/rpc.ypupdated/update.c

Modified: head/usr.sbin/rpc.ypupdated/update.c
==============================================================================
--- head/usr.sbin/rpc.ypupdated/update.c	Mon Feb 18 02:59:47 2019	(r344243)
+++ head/usr.sbin/rpc.ypupdated/update.c	Mon Feb 18 03:15:25 2019	(r344244)
@@ -263,11 +263,14 @@ localupdate(char *name, char *filename, u_int op, u_in
 	sprintf(tmpname, "%s.tmp", filename);
 	rf = fopen(filename, "r");
 	if (rf == NULL) {
-		return (ERR_READ);
+		err = ERR_READ;
+		goto cleanup;
 	}
 	wf = fopen(tmpname, "w");
 	if (wf == NULL) {
-		return (ERR_WRITE);
+		fclose(rf);
+		err = ERR_WRITE;
+		goto cleanup;
 	}
 	err = -1;
 	while (fgets(line, sizeof (line), rf)) {
@@ -307,13 +310,17 @@ localupdate(char *name, char *filename, u_int op, u_in
 	fclose(rf);
 	if (err == 0) {
 		if (rename(tmpname, filename) < 0) {
-			return (ERR_DBASE);
+			err = ERR_DBASE;
+			goto cleanup;
 		}
 	} else {
 		if (unlink(tmpname) < 0) {
-			return (ERR_DBASE);
+			err = ERR_DBASE;
+			goto cleanup;
 		}
 	}
+cleanup:
+	free(tmpname);
 	return (err);
 }