Author: sobomax
Date: Fri Jun 23 17:39:00 2017
New Revision: 320277
URL: https://svnweb.freebsd.org/changeset/base/320277
Log:
Don't leak file descriptor in some cases.
Reported by: cem
MFC after: 6 weeks
Modified:
head/usr.bin/mkuzip/mkuz_insize.c
Modified: head/usr.bin/mkuzip/mkuz_insize.c
==============================================================================
--- head/usr.bin/mkuzip/mkuz_insize.c Fri Jun 23 17:31:07 2017
(r320276)
+++ head/usr.bin/mkuzip/mkuz_insize.c Fri Jun 23 17:39:00 2017
(r320277)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <err.h>
#include <fcntl.h>
+#include <unistd.h>
#include "mkuz_cfg.h"
#include "mkuz_insize.h"
@@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
if (ffd < 0) {
warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
+ close(ffd);
return (-1);
}
if (ioctl(ffd, DIOCGMEDIASIZE, &ms) < 0) {
warn("ioctl(DIOCGMEDIASIZE)");
+ close(ffd);
return (-1);
}
+ close(ffd);
sb.st_size = ms;
} else if (S_ISCHR(sb.st_mode)) {
if (ioctl(cfp->fdr, DIOCGMEDIASIZE, &ms) < 0) {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
