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

fdopendir(): Do not close the passed file descriptor on failure.

Browse Source 
Reviewed by:	delphij
This commit is contained in:
jilles 2011-11-22 23:46:56 +00:00
parent 3946e53dad
commit e322b8dfb2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libc/gen/opendir.c
View File

@ -75,6 +75,8 @@ __opendir2(const char *name, int flags)
{
int fd;
struct stat statb;
DIR *dir;
int saved_errno;
/*
* stat() before _open() because opening of special files may be
@ -89,7 +91,13 @@ __opendir2(const char *name, int flags)
if ((fd = _open(name, O_RDONLY | O_NONBLOCK | O_DIRECTORY)) == -1)
return (NULL);
return __opendir_common(fd, name, flags);
dir = __opendir_common(fd, name, flags);
if (dir == NULL) {
saved_errno = errno;
_close(fd);
errno = saved_errno;
}
return (dir);
}
static int
@ -110,6 +118,7 @@ __opendir_common(int fd, const char *name, int flags)
int incr;
int saved_errno;
int unionstack;
int fd2;
struct stat statb;
dirp = NULL;
@ -199,14 +208,15 @@ __opendir_common(int fd, const char *name, int flags)
* which has also been read -- see fts.c.
*/
if (flags & DTF_REWIND) {
(void)_close(fd);
if ((fd = _open(name, O_RDONLY | O_DIRECTORY)) == -1) {
if ((fd2 = _open(name, O_RDONLY | O_DIRECTORY)) == -1) {
saved_errno = errno;
free(buf);
free(dirp);
errno = saved_errno;
return (NULL);
}
(void)_dup2(fd2, fd);
_close(fd2);
}
/*
@ -309,7 +319,6 @@ __opendir_common(int fd, const char *name, int flags)
fail:
saved_errno = errno;
free(dirp);
(void)_close(fd);
errno = saved_errno;
return (NULL);
}