diff options
| author | Eric Blake <eblake@redhat.com> | 2013-11-23 17:51:53 +0400 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2013-11-23 17:51:53 +0400 |
| commit | 3a4ce7315fb87d51ef8dd46b9064ee766d5dda62 (patch) | |
| tree | 16e1609476fff1599fa6e3ab95dc502d5ed97091 /winsup/cygwin/dtable.cc | |
| parent | 7a5be33eb53b8bcde6102bf6b939fbbd26eb518a (diff) | |
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.
Diffstat (limited to 'winsup/cygwin/dtable.cc')
| -rw-r--r-- | winsup/cygwin/dtable.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 2501a26fd..c2982a8a7 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -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 */ { |