diff options
| -rw-r--r-- | io.c | 15 | ||||
| -rw-r--r-- | version.h | 6 |
2 files changed, 14 insertions, 7 deletions
@@ -4277,7 +4277,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; @@ -4325,7 +4325,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); @@ -4342,7 +4342,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); @@ -4422,6 +4422,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) @@ -4446,8 +4453,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); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.4" -#define RUBY_RELEASE_DATE "2018-03-06" -#define RUBY_PATCHLEVEL 252 +#define RUBY_RELEASE_DATE "2018-03-07" +#define RUBY_PATCHLEVEL 253 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" |