mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
* sysdeps/unix/opendir.c (__alloc_dir): If allocation fails for size
provided through st_blksize, try the default size before giving up.
This commit is contained in:
parent
43f6bec195
commit
221e523037
@ -1,3 +1,8 @@
|
||||
2008-03-30 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/opendir.c (__alloc_dir): If allocation fails for size
|
||||
provided through st_blksize, try the default size before giving up.
|
||||
|
||||
2008-03-29 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* stdio-common/vfprintf.c (vfprintf): Correct overflow test.
|
||||
|
@ -171,6 +171,8 @@ __alloc_dir (int fd, bool close_fd, const struct stat64 *statp)
|
||||
goto lose;
|
||||
}
|
||||
|
||||
const size_t default_allocation = (BUFSIZ < sizeof (struct dirent64)
|
||||
? sizeof (struct dirent64) : BUFSIZ);
|
||||
size_t allocation;
|
||||
#ifdef _STATBUF_ST_BLKSIZE
|
||||
if (__builtin_expect ((size_t) statp->st_blksize >= sizeof (struct dirent64),
|
||||
@ -178,20 +180,30 @@ __alloc_dir (int fd, bool close_fd, const struct stat64 *statp)
|
||||
allocation = statp->st_blksize;
|
||||
else
|
||||
#endif
|
||||
allocation = (BUFSIZ < sizeof (struct dirent64)
|
||||
? sizeof (struct dirent64) : BUFSIZ);
|
||||
allocation = default_allocation;
|
||||
|
||||
DIR *dirp = (DIR *) malloc (sizeof (DIR) + allocation);
|
||||
if (dirp == NULL)
|
||||
lose:
|
||||
{
|
||||
if (close_fd)
|
||||
#ifdef _STATBUF_ST_BLKSIZE
|
||||
if (allocation == statp->st_blksize
|
||||
&& allocation != default_allocation)
|
||||
{
|
||||
int save_errno = errno;
|
||||
close_not_cancel_no_status (fd);
|
||||
__set_errno (save_errno);
|
||||
allocation = default_allocation;
|
||||
dirp = (DIR *) malloc (sizeof (DIR) + allocation);
|
||||
}
|
||||
if (dirp == NULL)
|
||||
#endif
|
||||
lose:
|
||||
{
|
||||
if (close_fd)
|
||||
{
|
||||
int save_errno = errno;
|
||||
close_not_cancel_no_status (fd);
|
||||
__set_errno (save_errno);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
dirp->fd = fd;
|
||||
|
Loading…
Reference in New Issue
Block a user