diff options
| -rw-r--r-- | ext/socket/socket.c | 4 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 14e069bb8d..9eb36def14 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1287,7 +1287,7 @@ sock_s_getnameinfo(int argc, VALUE *argv) hptr = NULL; } else { - strncpy(hbuf, StringValuePtr(host), sizeof(hbuf)); + strncpy(hbuf, StringValueCStr(host), sizeof(hbuf)); hbuf[sizeof(hbuf) - 1] = '\0'; hptr = hbuf; } @@ -1301,7 +1301,7 @@ sock_s_getnameinfo(int argc, VALUE *argv) pptr = pbuf; } else { - strncpy(pbuf, StringValuePtr(port), sizeof(pbuf)); + strncpy(pbuf, StringValueCStr(port), sizeof(pbuf)); pbuf[sizeof(pbuf) - 1] = '\0'; pptr = pbuf; } diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 7e75837e8f..5ee09f8e9d 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -105,6 +105,8 @@ class TestSocket < Test::Unit::TestCase def test_getnameinfo 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 def test_ip_address_list |