qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/fdopendir.c (fdopendir): Make sure descriptor 

allows reading.
This commit is contained in:
Ulrich Drepper 2005-10-15 17:28:08 +00:00
parent ebb58ba3c2
commit b7cd532556
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-10-15 Ulrich Drepper <drepper@redhat.com> 2005-10-15 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/fdopendir.c (fdopendir): Make sure descriptor
allows reading.
* wcsmbs/tst-mbrtowc2.c: Use de_DE.UTF-8 instead of en_US.UTF-8. * wcsmbs/tst-mbrtowc2.c: Use de_DE.UTF-8 instead of en_US.UTF-8.
* wcsmbs/Makefile: Define tst-mbrtowc2-ENV. * wcsmbs/Makefile: Define tst-mbrtowc2-ENV.

10
sysdeps/unix/fdopendir.c
View File

@ -18,6 +18,7 @@
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <not-cancel.h> #include <not-cancel.h>
@ -35,6 +36,15 @@ fdopendir (int fd)
__set_errno (ENOTDIR); __set_errno (ENOTDIR);
return NULL; return NULL;
} }
/* Make sure the descriptor allows for reading. */
int flags = __fcntl (fd, F_GETFL);
if (__builtin_expect (flags == -1, 0))
return NULL;
if (__builtin_expect ((flags & O_ACCMODE) == O_WRONLY, 0))
{
__set_errno (EINVAL);
return NULL;
}
return __alloc_dir (fd, false, &statbuf); return __alloc_dir (fd, false, &statbuf);
} }