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

socket.c: null byte at Socket.getnameinfo

Browse Source 
* ext/socket/socket.c (sock_s_getnameinfo): check null byte.
  patched by tommy (Masahiro Tomita) in [ruby-dev:50286].
  [Bug #13994]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-11 06:16:04 +00:00
parent 0c551b7a6d
commit fb89004a3b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/socket/socket.c
View File

@ -1287,7 +1287,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
hptr = NULL; hptr = NULL;
} }
else { else {
strncpy(hbuf, StringValuePtr(host), sizeof(hbuf)); strncpy(hbuf, StringValueCStr(host), sizeof(hbuf));
hbuf[sizeof(hbuf) - 1] = '\0'; hbuf[sizeof(hbuf) - 1] = '\0';
hptr = hbuf; hptr = hbuf;
} }
@ -1301,7 +1301,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
pptr = pbuf; pptr = pbuf;
} }
else { else {
strncpy(pbuf, StringValuePtr(port), sizeof(pbuf)); strncpy(pbuf, StringValueCStr(port), sizeof(pbuf));
pbuf[sizeof(pbuf) - 1] = '\0'; pbuf[sizeof(pbuf) - 1] = '\0';
pptr = pbuf; pptr = pbuf;
} }

2
test/socket/test_socket.rb
View File

@ -105,6 +105,8 @@ class TestSocket < Test::Unit::TestCase
def test_getnameinfo def test_getnameinfo
assert_raise(SocketError) { Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"]) } assert_raise(SocketError) { Socket.getnameinfo(["AF_UNIX", 80, "0.0.0.0"]) }
assert_raise(ArgumentError) {Socket.getnameinfo(["AF_INET", "http\0", "example.net"])}
assert_raise(ArgumentError) {Socket.getnameinfo(["AF_INET", "http", "example.net\0"])}
end end
def test_ip_address_list def test_ip_address_list