From 28f00e2eeb65e0799fd5e604e346bd94cc851c33 Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Tue, 4 Jan 2011 10:14:25 +0000
Subject: [PATCH] Fix fd leaks in error cases. Found by cppcheck.

---
 usr.sbin/sup/source/scan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/sup/source/scan.c b/usr.sbin/sup/source/scan.c
index 0f824ef245a3..116a0938aaff 100644
--- a/usr.sbin/sup/source/scan.c
+++ b/usr.sbin/sup/source/scan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scan.c,v 1.27 2009/10/17 20:46:03 christos Exp $	*/
+/*	$NetBSD: scan.c,v 1.28 2011/01/04 10:14:25 wiz Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -968,9 +968,9 @@ makescanfile(char *scanfile)
 	if (scanF == NULL)
 		goto out;
 	if (fprintf(scanF, "V%d\n", SCANVERSION) < 0)
-		goto out;
+		goto closeout;
 	if (Tprocess(listT, recordone, scanF) != SCMOK)
-		goto out;
+		goto closeout;
 	if (fclose(scanF) != 0)
 		goto out;
 	if (rename(tname, fname) < 0) {
@@ -983,6 +983,8 @@ makescanfile(char *scanfile)
 	tbuf[1].tv_usec = 0;
 	(void) utimes(fname, tbuf);
 	return;
+closeout:
+	(void) fclose(scanF);
 out:
 	goaway("Can't write scan file temp %s for %s", tname, collname);
 }