Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file descriptor leak. Found by cppcheck.

Browse Source
This commit is contained in:
wiz 2011-01-04 23:31:29 +00:00
parent a5d0318667
commit 23f77c56dc
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ccdconfig/ccdconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccdconfig.c,v 1.49 2009/03/16 12:52:07 lukem Exp $ */
/* $NetBSD: ccdconfig.c,v 1.50 2011/01/04 23:31:29 wiz Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: ccdconfig.c,v 1.49 2009/03/16 12:52:07 lukem Exp $");
__RCSID("$NetBSD: ccdconfig.c,v 1.50 2011/01/04 23:31:29 wiz Exp $");
#endif
#include <sys/param.h>
@ -471,9 +471,11 @@ do_io(char *path, u_long cmd, struct ccd_ioctl *cciop)
cp = "unknown";
}
warn("ioctl (%s): %s", cp, path);
(void)close(fd);
return (1);
}
(void)close(fd);
return (0);
}

14
sbin/ldconfig/ldconfig.c
View File

@ -1,4 +1,4 @@
/* $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.
@ -31,7 +31,7 @@
#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
@ -467,20 +467,20 @@ buildhints(void)
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);
@ -501,6 +501,8 @@ buildhints(void)
free(blist);
free(strtab);
return 0;
fdout:
(void)close(fd);
out:
free(blist);
free(strtab);