diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-14 02:44:57 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-14 02:44:57 +0000 |
| commit | d24e1dac2b66afc3265065209686970481fb5367 (patch) | |
| tree | 8275e1a083e38124cb3a7d20b76c004ec250afe5 | |
| parent | 4e7c8bbe034e7f96b4d2880f99cf1bc75d4c6097 (diff) | |
| download | ruby-d24e1dac2b66afc3265065209686970481fb5367.tar.gz | |
* thread.c (rb_fd_rcopy): added an argument guard.
Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Sep 14 11:43:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * thread.c (rb_fd_rcopy): added an argument guard. + Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435] + Tue Sep 13 20:21:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v. @@ -2469,7 +2469,9 @@ rb_fd_rcopy(fd_set *dst, rb_fdset_t *src) { int max = rb_fd_max(src); - if (max > FD_SETSIZE) { + /* we assume src is the result of select() with dst, so dst should be + * larger or equal than src. */ + if (max > FD_SETSIZE || max > dst->fd_count) { rb_raise(rb_eArgError, "too large fdsets"); } |