d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leak file descriptor in some cases.

Browse Source 
Reported by:	cem
MFC after:	6 weeks
This commit is contained in:
sobomax 2017-06-23 17:39:00 +00:00
parent 54e47e4fc2
commit 8f9a541591
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/mkuzip/mkuz_insize.c
View File

@ -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) {