summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_io.rb11
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8738c8aaed..2bb81f248d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 9 18:21:03 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/ruby/test_io.rb (test_advise_pipe): new test to check
+ io.advise() against anonymous io object don't make crash.
+ made by Eric Wong. [Bug #6081] [ruby-core:42880]
+
Sun Sep 9 16:47:12 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index d1edaaf8a9..f165c640b1 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2436,4 +2436,15 @@ End
assert_equal(data, buf, bug6099)
rescue RuntimeError # can't modify string; temporarily locked
end
+
+ def test_advise_pipe
+ # we don't know if other platforms have a real posix_fadvise()
+ return if /linux/ !~ RUBY_PLATFORM
+ with_pipe do |r,w|
+ # Linux 2.6.15 and earlier returned EINVAL instead of ESPIPE
+ assert_raise(Errno::ESPIPE, Errno::EINVAL) { r.advise(:willneed) }
+ assert_raise(Errno::ESPIPE, Errno::EINVAL) { w.advise(:willneed) }
+ end
+ end
end
+