summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-01 02:08:48 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-01 02:08:48 +0000
commitc05fd75befe5b6021e7926452d6813c3472f540f (patch)
tree9c816d8eff64462c6bba865db1e8f421bf9afd07
parent2e4fb84f7c78d7d9cd24d1802ef97fda6d2466d0 (diff)
* thread.c (do_select): fix memory leak.
Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bb2f1eb23..b80165670d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 1 11:07:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (do_select): fix memory leak.
+ Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702]
+
Fri Jul 1 08:21:28 2011 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_getivar): check vm state version
diff --git a/thread.c b/thread.c
index 9e869069fc..3ef587b33f 100644
--- a/thread.c
+++ b/thread.c
@@ -2620,6 +2620,14 @@ do_select(int n, rb_fdset_t *read, rb_fdset_t *write, rb_fdset_t *except,
break;
}
}
+
+ if (read)
+ rb_fd_term(&orig_read);
+ if (write)
+ rb_fd_term(&orig_write);
+ if (except)
+ rb_fd_term(&orig_except);
+
return result;
}