diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/readline/readline.c | 11 | ||||
| -rw-r--r-- | test/readline/test_readline.rb | 10 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 28 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Feb 8 10:54:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/readline/readline.c (readline_readline): check if outstream + is closed to get rid of a bug of readline 6. [ruby-dev:45043] + [Bug #5803] + Wed Feb 8 10:52:51 2012 NARUSE, Yui <naruse@ruby-lang.org> * ext/readline/readline.c (Init_readline): like r18313, libedit's diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 3114b38bd3..34ce023bea 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -40,6 +40,10 @@ #include <unistd.h> #endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif + static VALUE mReadline; #define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper" @@ -372,6 +376,13 @@ readline_readline(int argc, VALUE *argv, VALUE self) } if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin"); + if (rl_outstream) { + struct stat stbuf; + int fd = fileno(rl_outstream); + if (fd < 0 || fstat(fd, &stbuf) != 0) { + rb_raise(rb_eIOError, "closed stdout"); + } + } #ifdef _WIN32 rl_prep_terminal(1); diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index a504fa5e2f..b2e67ec1b1 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -283,6 +283,16 @@ class TestReadline < Test::Unit::TestCase end end + def test_closed_outstream + bug5803 = '[ruby-dev:45043]' + IO.pipe do |r, w| + Readline.input = r + Readline.output = w + (w << "##\t").close + assert_raise(IOError, bug5803) {Readline.readline} + end + end + private def replace_stdio(stdin_path, stdout_path) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 61 +#define RUBY_PATCHLEVEL 62 #define RUBY_RELEASE_DATE "2012-02-08" #define RUBY_RELEASE_YEAR 2012 |