kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

io.c: fix segfault with closing socket on Windows

Browse source 
* 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
This commit is contained in:
shirosaki 2017-09-28 13:43:21 +00:00
parent c4130b0958
commit fd50c2ee44
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
io.c
View file

@ -4295,7 +4295,7 @@ static void free_io_buffer(rb_io_buffer_t *buf);
static void clear_codeconv(rb_io_t *fptr); static void clear_codeconv(rb_io_t *fptr);
static void 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; VALUE err = Qnil;
int fd = fptr->fd; int fd = fptr->fd;
@ -4343,7 +4343,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise)
* We assumes it is closed. */ * We assumes it is closed. */
/**/ /**/
int keepgvl = !(mode & FMODE_WRITABLE); keepgvl |= !(mode & FMODE_WRITABLE);
keepgvl |= noraise; keepgvl |= noraise;
if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err)) if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno); err = noraise ? Qtrue : INT2NUM(errno);
@ -4360,7 +4360,7 @@ fptr_finalize_flush(rb_io_t *fptr, int noraise)
static void static void
fptr_finalize(rb_io_t *fptr, int noraise) 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->rbuf);
free_io_buffer(&fptr->wbuf); free_io_buffer(&fptr->wbuf);
clear_codeconv(fptr); clear_codeconv(fptr);
@ -4440,6 +4440,13 @@ rb_io_memsize(const rb_io_t *fptr)
return size; 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); int rb_notify_fd_close(int fd);
static rb_io_t * static rb_io_t *
io_close_fptr(VALUE io) io_close_fptr(VALUE io)
@ -4464,8 +4471,8 @@ io_close_fptr(VALUE io)
fd = fptr->fd; fd = fptr->fd;
busy = rb_notify_fd_close(fd); busy = rb_notify_fd_close(fd);
fptr_finalize_flush(fptr, FALSE);
if (busy) { if (busy) {
fptr_finalize_flush(fptr, FALSE, KEEPGVL);
do rb_thread_schedule(); while (rb_notify_fd_close(fd)); do rb_thread_schedule(); while (rb_notify_fd_close(fd));
} }
rb_io_fptr_cleanup(fptr, FALSE); rb_io_fptr_cleanup(fptr, FALSE);