PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

dup2: fix off-by-one crash 

* dtable.cc (dup3): Fix off-by-one.
(find_unused_handle): Reduce time spent expanding during dup.
* syscalls.cc (setdtablesize): Report error on invalid value.
This commit is contained in:
Eric Blake 2013-11-23 13:51:53 +00:00
parent 7a5be33eb5
commit 3a4ce7315f
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2013-11-23 Eric Blake <eblake@redhat.com>
dup2: fix off-by-one crash
* dtable.cc (dup3): Fix off-by-one.
(find_unused_handle): Reduce time spent expanding during dup.
* syscalls.cc (setdtablesize): Report error on invalid value.
2013-11-20 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/stdlib.h (realpath): Drop declaration. It's declared

4
winsup/cygwin/dtable.cc
View File

@ -233,7 +233,7 @@ dtable::find_unused_handle (int start)
if (fds[i] == NULL)
return i;
}
while (extend (NOFILE_INCR));
while (extend (MAX (NOFILE_INCR, start - size)));
return -1;
}
@ -754,7 +754,7 @@ dtable::dup3 (int oldfd, int newfd, int flags)
if (!not_open (newfd))
close (newfd);
else if ((size_t) newfd > size
else if ((size_t) newfd >= size
&& find_unused_handle (newfd) < 0)
/* couldn't extend fdtab */
{

6
winsup/cygwin/syscalls.cc
View File

@ -2578,6 +2578,12 @@ system (const char *cmdstring)
extern "C" int
setdtablesize (int size)
{
if (size < 0)
{
set_errno (EINVAL);
return -1;
}
if (size <= (int)cygheap->fdtab.size || cygheap->fdtab.extend (size - cygheap->fdtab.size))
return 0;