Tue Jan 4 23:34:06 2011 UTC ()

Fix file descriptor leak. Found by cppcheck.


(wiz)

diff -r1.47 -r1.48 src/sbin/ldconfig/ldconfig.c

--- src/sbin/ldconfig/ldconfig.c 2010/05/13 17:52:12	1.47
+++ src/sbin/ldconfig/ldconfig.c 2011/01/04 23:34:06	1.48

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ldconfig.c,v 1.47 2010/05/13 17:52:12 tnozaki Exp $	*/
+/*	$NetBSD: ldconfig.c,v 1.48 2011/01/04 23:34:06 wiz Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldconfig.c,v 1.47 2010/05/13 17:52:12 tnozaki Exp $");
+__RCSID("$NetBSD: ldconfig.c,v 1.48 2011/01/04 23:34:06 wiz Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <sys/exec_aout.h>
 #include <a.out.h>
 #include <ctype.h>
 #include <dirent.h>
 @@ -457,60 +457,62 @@ buildhints(void)
 	if (str_index != strtab_sz) {
 		errx(1, "str_index(%d) != strtab_sz(%d)", str_index, strtab_sz);
+	}
 	tempfile = concat(_PATH_LD_HINTS, ".XXXXXX", "");
 	if ((fd = mkstemp(tempfile)) == -1) {
 		warn("%s", tempfile);
 		goto out;
+	}
 	if (write(fd, &hdr, sizeof(struct hints_header)) !=
 	    sizeof(struct hints_header)) {
 		warn("%s", _PATH_LD_HINTS);
-		goto out;
+		goto fdout;
+	}
 	if ((size_t)write(fd, blist, hdr.hh_nbucket * sizeof(struct hints_bucket)) !=
 		  hdr.hh_nbucket * sizeof(struct hints_bucket)) {
 		warn("%s", _PATH_LD_HINTS);
-		goto out;
+		goto fdout;
+	}
 	if (write(fd, strtab, strtab_sz) != strtab_sz) {
 		warn("%s", _PATH_LD_HINTS);
-		goto out;
+		goto fdout;
+	}
 	if (fchmod(fd, 0444) == -1) {
 		warn("%s", _PATH_LD_HINTS);
-		goto out;
+		goto fdout;
+	}
 	if (close(fd) != 0) {
 		warn("%s", _PATH_LD_HINTS);
 		goto out;
+	}
 	/* Install it */
 	if (unlink(_PATH_LD_HINTS) != 0 && errno != ENOENT) {
 		warn("%s", _PATH_LD_HINTS);
 		goto out;
+	}
 	if (rename(tempfile, _PATH_LD_HINTS) != 0) {
 		warn("%s", _PATH_LD_HINTS);
 		goto out;
+	}
 	free(blist);
 	free(strtab);
 	return 0;
 fdout:
 	(void)close(fd);
 out:
 	free(blist);
 	free(strtab);
 	return -1;
+}
 static int
 readhints(void)
+{
 	int			fd;
 	void			*addr = (void *) -1;
 	size_t			msize = 0;
 	struct hints_header	*hdr;