1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

console.c: unpaired size

Browse Source 
* 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
This commit is contained in:
nobu 2017-01-07 23:02:29 +00:00
parent 945934cc9a
commit b4a55c1cad
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/io/console/console.c
View File

@ -535,11 +535,15 @@ console_set_winsize(VALUE io, VALUE size)
VALUE row, col, xpixel, ypixel; VALUE row, col, xpixel, ypixel;
const VALUE *sz; const VALUE *sz;
int fd; int fd;
int sizelen; long sizelen;
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
size = rb_Array(size); 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); sz = RARRAY_CONST_PTR(size);
row = sz[0], col = sz[1], xpixel = ypixel = Qnil; row = sz[0], col = sz[1], xpixel = ypixel = Qnil;
if (sizelen == 4) xpixel = sz[2], ypixel = sz[3]; if (sizelen == 4) xpixel = sz[2], ypixel = sz[3];

1
test/io/console/test_io_console.rb
View File

@ -257,6 +257,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do
else else
assert(false, "winsize on #{path} succeed: #{s.inspect}") assert(false, "winsize on #{path} succeed: #{s.inspect}")
end end
assert_raise(ArgumentError) {io.winsize = [0, 0, 0]}
end end
end end
end end