From fd50c2ee44e8ed1b1bc9bbc945638a121c4c8468 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Thu, 28 Sep 2017 13:43:21 +0000 Subject: io.c: fix segfault with closing socket on Windows * io.c (fptr_finalize_flush): add an argument to keep GVL. * io.c (fptr_finalize): adjust for above change. * io.c (io_close_fptr): closing without GVL causes another exception while raising exception in another thread. This causes segfault on Windows. Keep GVL while closing when another thread raises. [Bug #13856] [ruby-core:82602] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/io.c b/io.c index 0f6afb7bc4..1254e92363 100644 --- a/io.c +++ b/io.c @@ -4295,7 +4295,7 @@ static void free_io_buffer(rb_io_buffer_t *buf); static void clear_codeconv(rb_io_t *fptr); static void -fptr_finalize_flush(rb_io_t *fptr, int noraise) +fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl) { VALUE err = Qnil; int fd = fptr->fd; @@ -4343,7 +4343,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise) * We assumes it is closed. */ /**/ - int keepgvl = !(mode & FMODE_WRITABLE); + keepgvl |= !(mode & FMODE_WRITABLE); keepgvl |= noraise; if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err)) err = noraise ? Qtrue : INT2NUM(errno); @@ -4360,7 +4360,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise) static void fptr_finalize(rb_io_t *fptr, int noraise) { - fptr_finalize_flush(fptr, noraise); + fptr_finalize_flush(fptr, noraise, FALSE); free_io_buffer(&fptr->rbuf); free_io_buffer(&fptr->wbuf); clear_codeconv(fptr); @@ -4440,6 +4440,13 @@ rb_io_memsize(const rb_io_t *fptr) return size; } +#ifdef _WIN32 +/* keep GVL while closing to prevent crash on Windows */ +# define KEEPGVL TRUE +#else +# define KEEPGVL FALSE +#endif + int rb_notify_fd_close(int fd); static rb_io_t * io_close_fptr(VALUE io) @@ -4464,8 +4471,8 @@ io_close_fptr(VALUE io) fd = fptr->fd; busy = rb_notify_fd_close(fd); - fptr_finalize_flush(fptr, FALSE); if (busy) { + fptr_finalize_flush(fptr, FALSE, KEEPGVL); do rb_thread_schedule(); while (rb_notify_fd_close(fd)); } rb_io_fptr_cleanup(fptr, FALSE); -- cgit v1.2.3