summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-21 03:26:38 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-21 03:26:38 +0000
commit8d0f5f1bfa7bf9cd257f381fd6cc80b99a2edcd7 (patch)
tree522480ec4b4922cd0971046390e63ca4014ae466 /thread.c
parent33c74657ff49e554f0183fbd84599819576b63a2 (diff)
thread.c (do_select): fix leak on exception
When do_select is interrupted and raise happens from RUBY_VM_CHECK_INTS_BLOCKING, the original FD sets we copied do not get freed, leading to a memory leak. Wrap up all the FD sets into a Ruby object to ensure the GC can release an allocations made for rb_fdset_t. This leak existed since Ruby 2.0.0 (r36430) [Bug #14929] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c55
1 files changed, 42 insertions, 13 deletions
diff --git a/thread.c b/thread.c
index 3943cf0..6181a75 100644
--- a/thread.c
+++ b/thread.c
@@ -3840,27 +3840,57 @@ wait_retryable(int *result, int errnum, struct timespec *timeout,
#define restore_fdset(fds1, fds2) \
((fds1) ? rb_fd_dup(fds1, fds2) : (void)0)
+struct select_set {
+ rb_fdset_t read;
+ rb_fdset_t write;
+ rb_fdset_t except;
+};
+
+static size_t
+select_set_memsize(const void *p)
+{
+ return sizeof(struct select_set);
+}
+
+static void
+select_set_free(void *p)
+{
+ struct select_set *orig = p;
+
+ rb_fd_term(&orig->read);
+ rb_fd_term(&orig->write);
+ rb_fd_term(&orig->except);
+ xfree(orig);
+}
+
+static const rb_data_type_t select_set_type = {
+ "select_set",
+ {NULL, select_set_free, select_set_memsize,},
+ 0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
static int
do_select(int n, rb_fdset_t *const readfds, rb_fdset_t *const writefds,
rb_fdset_t *const exceptfds, struct timeval *timeout)
{
int MAYBE_UNUSED(result);
int lerrno;
- rb_fdset_t MAYBE_UNUSED(orig_read);
- rb_fdset_t MAYBE_UNUSED(orig_write);
- rb_fdset_t MAYBE_UNUSED(orig_except);
struct timespec ts, end, *tsp;
rb_thread_t *th = GET_THREAD();
+ VALUE o;
+ struct select_set *orig;
+
+ o = TypedData_Make_Struct(0, struct select_set, &select_set_type, orig);
timeout_prepare(&tsp, &ts, &end, timeout);
#define do_select_update() \
- (restore_fdset(readfds, &orig_read), \
- restore_fdset(writefds, &orig_write), \
- restore_fdset(exceptfds, &orig_except), \
+ (restore_fdset(readfds, &orig->read), \
+ restore_fdset(writefds, &orig->write), \
+ restore_fdset(exceptfds, &orig->except), \
TRUE)
#define fd_init_copy(f) \
- (f##fds) ? rb_fd_init_copy(&orig_##f, f##fds) : rb_fd_no_init(&orig_##f)
+ (f##fds) ? rb_fd_init_copy(&orig->f, f##fds) : rb_fd_no_init(&orig->f)
fd_init_copy(read);
fd_init_copy(write);
fd_init_copy(except);
@@ -3875,14 +3905,13 @@ do_select(int n, rb_fdset_t *const readfds, rb_fdset_t *const writefds,
if (result < 0) lerrno = errno;
}, ubf_select, th, FALSE);
- RUBY_VM_CHECK_INTS_BLOCKING(th->ec);
+ RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may raise */
} while (wait_retryable(&result, lerrno, tsp, &end) && do_select_update());
-#define fd_term(f) if (f##fds) rb_fd_term(&orig_##f)
- fd_term(read);
- fd_term(write);
- fd_term(except);
-#undef fd_term
+ /* didn't raise, perform cleanup ourselves */
+ select_set_free(orig);
+ rb_gc_force_recycle(o);
+
if (result < 0) {
errno = lerrno;
}