From b4a55c1cad98b77a6ed6e6553aed1ebe12f538bd Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 7 Jan 2017 23:02:29 +0000 Subject: 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/trunk@57282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/io/console/console.c | 8 ++++++-- test/io/console/test_io_console.rb | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 53580d1d4e..6f45537e27 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -535,11 +535,15 @@ console_set_winsize(VALUE io, VALUE size) VALUE row, col, xpixel, ypixel; const VALUE *sz; int fd; - int sizelen; + long sizelen; GetOpenFile(io, fptr); size = rb_Array(size); - rb_check_arity(sizelen = RARRAY_LENINT(size), 2, 4); + if ((sizelen = RARRAY_LEN(size)) != 2 && sizelen != 4) { + rb_raise(rb_eArgError, + "wrong number of arguments (given %ld, expected 2 or 4)", + sizelen); + } sz = RARRAY_CONST_PTR(size); row = sz[0], col = sz[1], xpixel = ypixel = Qnil; if (sizelen == 4) xpixel = sz[2], ypixel = sz[3]; diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index f9f7b3d18b..581500dfd7 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -257,6 +257,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do else assert(false, "winsize on #{path} succeed: #{s.inspect}") end + assert_raise(ArgumentError) {io.winsize = [0, 0, 0]} end end end -- cgit v1.2.3