diff options
| -rw-r--r-- | ext/socket/unixsocket.c | 2 | ||||
| -rw-r--r-- | test/socket/test_unix.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 5a44b552f8..bf373f20ec 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -33,7 +33,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server) int fd, status; rb_io_t *fptr; - SafeStringValue(path); + FilePathValue(path); INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un)); if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) { diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 36f48c35ed..6efb1d60ee 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -284,6 +284,16 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase File.unlink path if path && File.socket?(path) end + def test_open_nul_byte + tmpfile = Tempfile.new("s") + path = tmpfile.path + tmpfile.close(true) + assert_raise(ArgumentError) {UNIXServer.open(path+"\0")} + assert_raise(ArgumentError) {UNIXSocket.open(path+"\0")} + ensure + File.unlink path if path && File.socket?(path) + end + def test_addr bound_unix_socket(UNIXServer) {|serv, path| UNIXSocket.open(path) {|c| |