merge revision(s) 57280,57282: [Backport #13112]

	console.c: OOB access

	* ext/io/console/console.c (console_set_winsize): fix
	  out-of-bounds access.  [ruby-core:79004] [Bug #13112]
	console.c: unpaired size

	* ext/io/console/console.c (console_set_winsize): reject unpaired
	  pixel size.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 31 insertions, 0 deletions

diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index 36619cebd5..e9716fac2d 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -233,11 +233,42 @@ class TestIO_Console < Test::Unit::TestCase
       begin
         assert_equal([0, 0], s.winsize)
       rescue Errno::EINVAL # OpenSolaris 2009.06 TIOCGWINSZ causes Errno::EINVAL before TIOCSWINSZ.
+      else
+        assert_equal([80, 25], s.winsize = [80, 25])
+        assert_equal([80, 25], s.winsize)
+        assert_equal([80, 25], m.winsize)
+        assert_equal([100, 40], m.winsize = [100, 40])
+        assert_equal([100, 40], s.winsize)
+        assert_equal([100, 40], m.winsize)
       end
     }
   end
 
+  def test_set_winsize_invalid_dev
+    [IO::NULL, __FILE__].each do |path|
+      open(path) do |io|
+        begin
+          s = io.winsize
+        rescue SystemCallError => e
+          assert_raise(e.class) {io.winsize = [0, 0]}
+        else
+          assert(false, "winsize on #{path} succeed: #{s.inspect}")
+        end
+        assert_raise(ArgumentError) {io.winsize = [0, 0, 0]}
+      end
+    end
+  end
+
   if IO.console
+    def test_set_winsize_console
+      s = IO.console.winsize
+      assert_kind_of(Array, s)
+      assert_equal(2, s.size)
+      assert_kind_of(Integer, s[0])
+      assert_kind_of(Integer, s[1])
+      assert_nothing_raised(TypeError) {IO.console.winsize = s}
+    end
+
     def test_close
       IO.console.close
       assert_kind_of(IO, IO.console)