diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-07 22:52:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-07 22:52:03 +0000 |
| commit | 5b856ee1a620f965dad6eaad759cfc23e5d697d6 (patch) | |
| tree | 645675a6d1af9b39f73848f0e96cbc7d54b61a75 /ext | |
| parent | d59dfcdb04f644b7e50e77a9a38d6063007fe6fb (diff) | |
console.c: OOB access
* ext/io/console/console.c (console_set_winsize): fix
out-of-bounds access. [ruby-core:79004] [Bug #13112]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/io/console/console.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/io/console/console.c b/ext/io/console/console.c index dbbfbb7463..53580d1d4e 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -535,12 +535,14 @@ console_set_winsize(VALUE io, VALUE size) VALUE row, col, xpixel, ypixel; const VALUE *sz; int fd; + int sizelen; GetOpenFile(io, fptr); size = rb_Array(size); - rb_check_arity(RARRAY_LENINT(size), 2, 4); + rb_check_arity(sizelen = RARRAY_LENINT(size), 2, 4); sz = RARRAY_CONST_PTR(size); - row = sz[0], col = sz[1], xpixel = sz[2], ypixel = sz[3]; + row = sz[0], col = sz[1], xpixel = ypixel = Qnil; + if (sizelen == 4) xpixel = sz[2], ypixel = sz[3]; fd = GetWriteFD(fptr); #if defined TIOCSWINSZ ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0; |