summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-03 22:37:07 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-03 22:37:07 +0000
commitf081eca1d7ca95a15989c2b59230430ff3dfe708 (patch)
treeede27390be76073477e0ee7c1b7abac3441e58c8
parent50522eb35172c4887b5a35919ebe8c52f00bfe71 (diff)
* thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
out by Eric Wong. [ruby-core:35982] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2665dc5ddc..c9a0fc80ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 4 07:33:00 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
+ out by Eric Wong. [ruby-core:35982]
+
Tue May 3 20:29:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
diff --git a/thread.c b/thread.c
index c272256d4b..486a5a2b6c 100644
--- a/thread.c
+++ b/thread.c
@@ -2389,7 +2389,7 @@ rb_fd_copy(rb_fdset_t *dst, const rb_fdset_t *src)
size = sizeof(fd_set);
dst->maxfd = src->maxfd;
dst->fdset = xrealloc(dst->fdset, size);
- memcpy(dst->fdset, src, size);
+ memcpy(dst->fdset, src->fdset, size);
}
int